Merge "liblog: build break" am: f58fb531ff
am: de5989ee12

* commit 'de5989ee12f803a0c5721a922552e554d71f5336':
  liblog: build break