Merge "Replace custom logwrapper implementation with liblogwrap"