Merge "liblog: clean up log_id.h includes"