Merge "Convert to Android.bp" am: 65631cf079 am: 8c3849a15d
am: cf9b5e13b9

Change-Id: I2f3e47dddd688ded4409fd61917367a6e705aa6c