Merge "Use current pid not tid to create a backtrace map."
am: eb804f6dfe

* commit 'eb804f6dfe695129c1fc334e3955f73e00707ece':
  Use current pid not tid to create a backtrace map.