Merge "Include AAPT2 in windows SDK" into nyc-dev