Tools to re-odex lollipop 5.0.x apk's (samsung s6)

There are lots of tools out there to deodex lollipop but what is the best way/tool to odex it back up after making smali changes?

Thanks