Remove engine-api leftovers Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb Component: engine