am 896d0ee2: am 999fd4ea: Merge "Also -DWIN32 to keep llvm building."

* commit '896d0ee2cf123f045af859d7291dba65a0b7d789':
  Also -DWIN32 to keep llvm building.