Merge "Convert to Android.bp" am: 9016ed8106 am: 80320575ce  -s ours am: 325e69119b  -s ours
am: 7ca107a0b9  -s ours

Change-Id: I119f7ba3ee9c54ef015b4b497b3f0d68b7df6401