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

Change-Id: If75f328a2be7d35f0bc67138cb499cf328d8e10a