Merge "Convert to Android.bp" am: e6be5fc431 am: 481030b1e2
am: 48dadcacc3

Change-Id: Ib90430a1bfd5f8a62907cc954a697b9827047a2e