Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev
automerge: ef92ab3  -s ours

* commit 'ef92ab3799cfa9d32610b943c00a1db92e5b31d9':
  Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue