Merge "A few fixes in SW VP8 encoder:"