Merge "Add liblog" into jb-mr2-dev