Bring up some upstream changes to tracekit