Merge "Add support for --replace-version to aapt2"
am: 186be90eb6

Change-Id: I6397623d883af229a8941bd26a084d09d40f48c9