Merge "Fix windows build of AAPT2"