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