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

Change-Id: I47b2613f0cfaf1f237bbdc432262b46fc3de3b9f