Merge "Convert to Android.bp" am: 90e0a80af3 am: 243ba5e7b2
am: 90955e6a6a

Change-Id: I8e4e8c784b4e6630b7d062c4238d8c885111df30