Merge "convert Android.mk to Android.bp"
am: c669370651

Change-Id: I43c41685acd0ba515e31d341083ed62da69bb981