Merge "adb: use correct _WIN32 macro." am: 5c75b529f6
am: dcaf6932fd

* commit 'dcaf6932fde9df11f415f683589f962858084cb1':
  adb: use correct _WIN32 macro.