Merge "Make raise/abort work with stale cached pid/tid values." am: 1f9e6488 am: 3537fa1c am: 8a84a0fa am: 4bfb891a Change-Id: I9e566568afa4035d3e6e823c8c072f6ae08d62e7