Merge "Remove a HAVE_MS_C_RUNTIME I missed."