am 029a8be3: am c33062ff: Merge "AAPT2: Proguard rules generation added." into mnc-dev

* commit '029a8be3284babbe6a4f948f79a67204359dbc49':
  AAPT2: Proguard rules generation added.