Merge "Convert to Android.bp"
am: dd780c160d

Change-Id: I4507ab3fb3dd1fb695adb769a211152fc36fdb99