am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev

* commit '94541e386359397078a65643a440aa03df464800':
  videoperf: specify timeout for VideoEncoderDecoderTest