Merge "Refactor ElfDebugReader."
am: 03c6b174a4

Change-Id: I4e83540c0b435dce19d3fbcaa2afe31ceb3b5d75