Merge "AAPT2: Fix layout versioning" into mnc-dev