Merge "Convert Android.mk file to Android.bp"
am: 348e5d7e64

Change-Id: Id8a44a138f1323d40b3c3d150ba30d3fe3d971c8