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

* commit 'f3c3bf5dfbd4fe666c6152a5a8030c1fbe95e73b':
  Revert "liblog: resolve deadlocks"