am ffd25c7f: am 84494473: am aaa9d8dc: Merge "Fix windows build"
am ffd25c7f: am 84494473: am aaa9d8dc: Merge "Fix windows build"

* commit 'ffd25c7f1445df9d6b8c28ada7b2174c6827ddcf':
  Fix windows build

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