Merge "Frameworks/base: Fix AAPT warnings"