Merge "Omx vts tests" into oc-dev
am: 2e2e255125

Change-Id: Ifcf78ffd3c042e3eeab90016dc822b747a9cadc1