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

Change-Id: I72624309516d618ab3b01316914587dc4022c03f