am e5e515f7: am 2cea7e84: am 76e9138f: am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev

* commit 'e5e515f7130bd3d2deb0c29a8894f60b1f9be78f':
  videoperf: specify timeout for VideoEncoderDecoderTest