Merge "Move aapt2 Windows binary to 64bit"