Merge "Add --replace-version flag to aapt."