am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev

* commit '14ae6e87c9822018e7fc139f66e60b4db6b08edb':
  Get rid of the liblog hack.