Merge "AAPT2: Implement attribute compat versioning" into oc-dev am: e229113d46
am: 138d2a65b3

Change-Id: Ie3502e99aefa46ee9fe62a0e821e55cb160b7142