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

Change-Id: Idfabd659eee33d0b101ab1d21c8b831b2ccdaaed