Merge "Revert "liblog: resolve deadlocks""