Merge "Convert to Android.bp" am: 4e3bf63705
am: c13b3501c4

Change-Id: I1946e8b47f70f5c4f55e3adf5194ecf9c912e753