Merge "Convert Android.mk to Android.bp."