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

Change-Id: I35e44448c5e7ef813f050d2422286f540b39490b