In two cases the bit cost of a movement vector was calculated twice
and summed when there were mutliple refs. The first result was
assigned and the second was added. Now they are both added in a loop
to reduce duplication.

Change-Id: Iadcaec1dc4c2583fbb5cfd07bea6480756692a01