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

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