am 3c3bf677: am 0b9382c7: Separate out Proguard flag files to fix dependency.

Merge commit '3c3bf6773ac7e2324c1d06282c625b81f799e427'

* commit '3c3bf6773ac7e2324c1d06282c625b81f799e427':
  Separate out Proguard flag files to fix dependency.