Merge "Fix warnings in libutils headers"