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

Change-Id: I2d890efcd38c3c7835d2eccb24265f226ac846f9