Merge "Convert to Android.bp"
am: 1cfc9bb140

Change-Id: Ic30d6d9bf11dcd5f581010d3d838aa4141fff593