Merge "vpxenc: clean up; move stats code out of vpxenc.c"