Merge "Revert "OMX: don't respect binderization toggle.""