Merge "AAPT2: inferred style parent processing" into mnc-dev