Merge "Remove OMX from compat matrix"