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

Change-Id: Ie289f8cad00443ced27f452ef4d5ed122f7ca85f