Merge "Replace cutils/log.h and log/logger.h with log/log.h"