Merge "Remove unused clz.cpp" into jb-mr2-dev