am 8022911e: am 013fe123: am ef92ab37: Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev

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