Merge "Fix undefined error in LOG_FATAL_IF."
am: a3ae0dbc0f

Change-Id: I055af06921f7edf18fb6639ca5ac3f4b5622bbb1