Merge "Frameworks/base: Fix more aapt issues"