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

* commit 'ab45664130064cd44cc5ceb85d41de90b995819b':
  AAPT: ProGuard config for components in main dex.

Change-Id: I07837378b17b2301040467356e9facdcad892c65