[automerger skipped] goldfish-codecs: render vp8 and vp9 on host am: 1a27438093 am: f67899e0d2 am: c4c5da6b5d -s ours am: 8e5f739032 -s ours

am skip reason: Change-Id Ie1ba9b4d3ae1b41c1fbddb0b56faf51f8ef9d0dc with SHA-1 0e3218de6f is in history

Change-Id: I336389d0d4acf2cfebe53e0ba1a77660e3c10b6d