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