Merge changes I2807b5a1,I59b020c2

* changes:
  vpxenc: add rate histogram display
  vpxenc: add quantizer histogram display