Merge "logwrapper: fix missing include"