Merge "AAPT: Fix regression in resource versioning" into mnc-dev