Merge "OMX VTS: Added a test to mandate transition to C2 codecs"