Merge "Get rid of the liblog hack." into jb-mr2-dev