Merge "Convert to Android.bp" am: a50b46b7bb am: 8651f91fbd
am: 806f548e79

Change-Id: Iba76d5f47e840fc613e9ddcf1a27bb96696d28d1