runtime: Update to latest master, fixes build