Clean up retrieving boot image address range. am: 1aff1efe67 am: a012fb1d1d
am: 53c8b476db

Change-Id: If0f0f5297d7118a934c9309438592950b401c82e