Merge "Convert to Android.bp" am: 1752ac1e55
am: 0476c6d079

Change-Id: I204c87e68252421b10f49b22ac0ffed4c93c216d