Merge "Revert "Convert Development/Android.mk to Android.bp""