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

Change-Id: I44a4dacd7f130e86e86ac0fb1fe260e5f67bbfd2