Merge "AAPT2: Add -x and -z flags to minimize changes in build scripts"