Merge "Convert to Android.bp"
am: 128f68acb2

Change-Id: I368f3b987cf1930d745edbd9c4740e61cee9b223