Merge "Convert to Android.bp" am: 9c3af9383f am: ce313a52f2
am: 4b24ed66c4

Change-Id: I3f37ae9dd6448bde9981c6218b29f1d7daf39cef