am ccd6223f: am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."

* commit 'ccd6223f5658dbc627cfe4827d3d6571107ef616':
  Fix windows/mingw build.