Merge "AAPT: ProGuard config for components in main dex." into nyc-dev