Merge "Revert "Revert "Revert "Remove unused modules made for non-Treble OMX""""