am 68f66cf7: am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."

* commit '68f66cf7e78fabe5ac1a803dc579a6ec7fabc682':
  Remove a HAVE_MS_C_RUNTIME I missed.