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

Change-Id: Ic96642cefbb6433ff07ec9ba37b611b24dc90616