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