Merge "Convert to Android.bp" am: 10348cbeb9 am: ded1346ca5 am: 51043f5e1d
am: 19e9a4ed2b

Change-Id: Ifcd4d3f879981c866918cb53ccde61bea76733e3