Merge "More user friendly vpxenc help strings."