Merge "Merge "AAPT: ProGuard config for components in main dex." into nyc-dev...
Merge "Merge "AAPT: ProGuard config for components in main dex." into nyc-dev am: ab456641 am: 341b4d07" into nyc-mr1-dev-plus-aosp
am: 3308dc59
* commit '3308dc59':
Change-Id: I496e5668f0f6a84c29674f21dcd32979158d5d74