Merge "Convert libandroid and libandroid_runtime to Android.bp"