Merge "Remove totally unused code from OMX.cpp"