Merge "Refactor ElfDebugReader." am: 03c6b174a4
am: 6a9b15a394

Change-Id: Ice9da25e2acf8fc239ea1446654badc9be8792c8