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

* commit '8c86e4e2c075c7a879a9f73b56ab075dde61176a':
  Remove a HAVE_MS_C_RUNTIME I missed.