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

Change-Id: I065f3e3b1ece855f3ebefa18082591819142e7ae