Merge "Remove deprecated cutils/log.h"