Merge "liblog: resolve deadlocks"
am: 8f8a88cad3

* commit '8f8a88cad334a630d6325672a7c6a32a0769a783':
  liblog: resolve deadlocks