Merge "Revert "Remove conditional vndbinder usage in OMX.""