Merge "media.omx VTS test baseline" into oc-dev
am: 9eeda9561f

Change-Id: I0cf89fa45f02285a8c4cfde6450f30c7af6225c1