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

Change-Id: I5a2951191fc8f57f68a56aa27a734b87cbe32af5