Merge "Revert "liblog: resolve deadlocks"" am: e6cf1c6372
am: 52b9f02076

* commit '52b9f0207659c8b23b8edf252152c2e657dfabea':
  Revert "liblog: resolve deadlocks"