am ded991b4: Merge "Revert "Fix Windows SDK build.""
am ded991b4: Merge "Revert "Fix Windows SDK build.""

* commit 'ded991b47d0235bd505b5d95e438118d0b7f1041':
  Revert "Fix Windows SDK build."

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build