Merge "liblog: don't sleep in the middle of tests"