Merge "Convert Android.mk file to Android.bp" am: bac50c02f3
am: 2f9c9126c5

Change-Id: If40cd0cc98c8742683c10a4a4c28f7f01669dd75