Merge "liblog: remove unneeded checks and includes from headers"