Merge "Split out codecs from BindingCodecContext"