Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp