Merge "Add support for --replace-version to aapt2"