Merge "Clean up some RecordPcInfo in x86 slow paths."