Merge "Convert Android.mk file to Android.bp" am: 67b20324c8
am: 8ca20f3a0a

Change-Id: I2cabff00c43ae58408c4663bec85426e10dad4ad