Merge "liblog: resolve deadlocks" am: 8f8a88cad3 am: 247e22090a
am: e5646f90c2

* commit 'e5646f90c21cd7dd5c16f239666090b5ae54e966':