Merge \"Add lock when iterating over BacktraceMap.\"
am: 58c0b44694

Change-Id: I9cef369f5927addb32b1c264a1dc91616f1831cb