am 5c1b04e4: Merge "EncodeDecodeTest: Test both VP8 and AVC"

* commit '5c1b04e49e91041396edc3c25e3ab52ee1af7239':
  EncodeDecodeTest: Test both VP8 and AVC