Merge "Convert Android.mk file to Android.bp." am: 4a5064b387
am: e9213fdd05

Change-Id: I19ac6aae070dec7b15dd5d8730bd529bd062164c