Merge "liblog: resolve deadlocks"