Merge \"Merge \\\"Fix Windows NDK labeling.\\\" into nyc-dev am: d1364cf0f1 am: 0ca5ae5208\" into nyc-mr1-dev-plus-aosp
am: 4ffaa76089

Change-Id: I5750bda6be344e554f3fece69edc86f7143c4982