Merge "Omx vts tests." into oc-dev
am: 1d619f743d

Change-Id: I80b3c97d186f56210b761e1cd642c209e5071358