Merge "Revert "Add liblog"" into jb-mr2-dev