Merge "liblog: resolve deadlocks" am: 5559f1d6e8
am: 650a06e01b

* commit '650a06e01bb3bf80a4223fcb9117f59fdcff4eb5':
  liblog: resolve deadlocks