Merge "Adding Opus related struct definitions to OMX_Index"