Merge "AAPT: ProGuard config for components in main dex." into nyc-dev am:...
Merge "AAPT: ProGuard config for components in main dex." into nyc-dev am: ab456641 am: 4056e46a
am: 8bdd37a0
* commit '8bdd37a0':
AAPT: ProGuard config for components in main dex.
Change-Id: I06c195f563002e187e160c7a75d3d25c02c706e7