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

Change-Id: Id09a1a7300b30eadd6c04551820eaf7d64e8a1af