Merge "Remove unused symbolic links to OMX header files"