Merge "Omx VTS tests" into oc-dev
am: 9ec2c9e099

Change-Id: I59f8401168779e7b06302e6ab5ea939c7c116877