Merge "Fix undefined error in LOG_FATAL_IF."