Merge "transform Android.mk to Android.bp"