Merge "VideoEditor: Issue:3396697: Update Perf and Stress test code"