am b2ce04b4: Merge "Make Windows a non-multilib target."

* commit 'b2ce04b4317331903b6ec325ea473f5fc5c8aca3':
  Make Windows a non-multilib target.