Merge "AAPT2: Update --no-version-vector list" into oc-dev