am 7cfccda6: am b5ccb461: Merge "Select the correct target STL with USE_MINGW."

* commit '7cfccda6590962299e86b4dd41c7d62056ec17e5':
  Select the correct target STL with USE_MINGW.