Merge pull request #20521 from estesp/vendor-engine-api-fix

Update engine-api vendoring to latest commit