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