HADOOP-10040. Correct merge error on native.vcxproj. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531994 13f79535-47bb-0310-9956-ffa450edef68