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

Change-Id: I420b7e347a47d21d49101c4e8ad4ef96cfd15af7