Merge "Fix the THR_MODES array used in vp9_pick_inter_mode"