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

* commit 'f59e2624b33a428bbe484168ac4f96ca36a6c32e':
  Get rid of the liblog hack.