Merge "Convert prebuilts/sdk/current/Android.mk to Android.bp"