Merge "AAPT2: Implement attribute compat versioning" into oc-dev