Merge "Convert Android.mk to Android.bp" am: b13276924c am: 088fb8d35a
am: 85522dde56

Change-Id: I154eb1297cb97725da13ce4dce5c882419c7e95c