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

Change-Id: I32f02135a3f911bdb3a9ccc027bbb768720be026