Merge "Convert to Android.bp"
am: a4c863fab6

Change-Id: Ie7b6c3f438d669e3428603be8bd07b20853989cd