Merge "AAPT2: Enable windows build and make sure it builds" into nyc-dev