Merge "Convert Android.mk file to Android.bp" am: 9beab9980b
am: fdfbf6cda8

Change-Id: I228e6fed454255fe50bfbee19fe39efeb6f174f7