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

* commit '8f94a2699dffe3b35201090c71ceca066dfbaf61':
  Fix Windows SDK build.

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