Merge "Convert Android.mk file to Android.bp" am: ef8a4f27bd
am: b8e66deb93

Change-Id: Ie4bad4c3c4e431c94ffbdd2ddc0422ebdaeac5d6