Merge "Add missing resource when building in AAPT1"