Merge "Begin converting Android.mk to Android.bp"