am 9f9d2aed: am 79b199b8: Merge "Fix Windows SDK build."
am 9f9d2aed: am 79b199b8: Merge "Fix Windows SDK build."

* commit '9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
  Fix Windows SDK build.

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