Merge "AAPT2: Emit more proguard keep rules for layouts and menus"