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

Change-Id: I1138e1742cf7c95edce9f5bb4bdb2ce3ba977d07