Merge "AAPT2: Proguard rules generation added." into mnc-dev