Merge "bullhead: add libandroid dependency" into nyc-dev