Merge "Convert Android.mk to Android.bp" am: 4d418b1e08
am: 93c1f4248d

Change-Id: Iaf51007cc1bfeac41ea8a94aaedd804baf3d1ff3