Merge "vpxenc: fix per-frame psnr/size output on a terminal"