Merge "Add support for vp9 playback in mp4"