Merge "Move simple matrix ops to the on device lib." into jb-mr2-dev