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

Change-Id: Ifa154db994f9110b1370d920daca9513396b0b92