Merge "Add --rename-resources-package to aapt2"