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