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