Merge "Prevent "index out of range" crash when addr2line aborts in between" am: 076bd27d03
am: f4b0e44285

Change-Id: I464bc585551a84a5f78535adb2c9ef07844dfab5