Fix mingw release build.

Change-Id: I9e7042ea4f45c8759014616ea51f1d11bc303bb6
Merge topic 'fix-mingw' into master

973e57a1 Fix mingw release build.