Merge "replace cutils/logger.h with log/logger.h"