Merge "Convert Android.mk file to Android.bp" am: 2c89906432 am: 881a06fc45
am: a84e972ce8

Change-Id: Id6696b0fea58f31a2c0f45195e1202f27b362e95