Merge "Remove conditional vndbinder usage in OMX."