Merge "AAPT2 statically link libz on Windows builds"