Merge "Add support for --replace-version to aapt2" into pi-dev-plus-aosp