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

Change-Id: I9e968b59c50a28c8bd0f812d5e1051afb10e798b