Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2"""