Merge "Fix Windows NDK labeling." into nyc-dev