Merge "liblog: resolve deadlocks"
am: 5559f1d6e8

* commit '5559f1d6e89d1a4a5140328deb9b420f7d540508':
  liblog: resolve deadlocks