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