Merge "Convert Android.mk to Android.bp"
am: b13276924c

Change-Id: I01cbce3e0c9ce0819f1b9ed9abba063617ae941f