Merge "AAPT2: Remove the need for specifying package name in compile phase" into mnc-dev