Remove a few more references to vp9

Change-Id: I322cb18eaff5e97fdca0c464115c15ea61b6bfe7
5 files changed