Merge "aomcx_set_ref -> aom_cx_set_ref" into nextgenv2