Merge \"Fix Windows NDK labeling.\" into nyc-dev
am: d1364cf0f1

Change-Id: I7d3b6ec3ee5580a06a04928218512d030e033d26