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

Change-Id: I36b7cf2c9f9190abd5b090a10b2ea538326f25f0