Merge "remove more vp8 and vp9 only code"