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

Change-Id: Ida153e4a01d1251f607017bf57be7e0b6384b351