Merge "AAPT2: Support --no-version-vectors" into nyc-dev