am a6065996: Merge "Stop defining WIN32."

* commit 'a6065996cd280acf11f199c1f90e1b8886635207':
  Stop defining WIN32.