Merge "Fix NULL dereferences in OMX.cpp"