Merge "Convert Android.mk file to Android.bp" am: 4b5b191b42
am: 1cdaea76a4

Change-Id: Ic093e88ba7b644239253952c3326c25309ecbfcd