Merge "AAPT: ProGuard config for components in main dex."
am: da66fa7526

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

Change-Id: I8835ea22af8b0c731236c28bd83fded212c6a72a