[automerger skipped] Merge "Fix undefined error in LOG_FATAL_IF." am: a3ae0dbc0f am: f468259bd6
am: 1b2f4baff2  -s ours

Change-Id: I7ff89ea26a7bd1e5774ce32ebbdadb7063078801