Fix mergefailure in liblog

Change-Id: I092acba9496eefea35bff7561617e15f5424fb97
Fix gr_text() syntax until minui gets updated

Change-Id: Ie6d72013944d7ce6d2c0a244862b464e513fa389
init: Fix some more mergefails

Change-Id: I6fbb230e0f0f4e93f25fb571ae2fb6ccfd12398e