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

* commit '247e22090ad2f31423c59f97f70420cbee21edf9':
  liblog: resolve deadlocks