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

Change-Id: I9aa10100c3edd0f18307780e6b466223e5b82756