Merge "liblog: build break"
am: f58fb531ff

* commit 'f58fb531ff9b75237f51ebeb3075e70c5d9deea9':
  liblog: build break