am 868b22dd: am 76c942c1: Merge "Fix Windows SDK build."
am 868b22dd: am 76c942c1: Merge "Fix Windows SDK build."

* commit '868b22dd277392cce899d9a980270fbaf8d2f9de':
  Fix Windows SDK build.

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