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

Change-Id: I637b54609e6ef86ab98bf0ef5a72552124712e38