I had done only a partial fix before. But updating the costs seems to
make an even bigger improvement to the baseline.

BUG=aomedia:1094

Change-Id: Id427819507143c05b4dc3d4c05e6b2a66d17899f