Merge "Test for _WIN32 in system/extras instead of USE_MINGW." am: 1607d18122 am: bc6d8081ce
am: bbbb529acf

Change-Id: Ic1fb45f99c4ee2a313520e538ffe94fc088438b6