Fix mergefailure in liblog

Change-Id: I092acba9496eefea35bff7561617e15f5424fb97