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

Change-Id: Ia483efe1c2a26a110073e6353b66292674a5ac53