Merge "vpx/*.h, cosmetics: fix some typos"