Merge "liblog: fix benchmark build after google-benchmark upgrade."