Further clean up boot image address checks. am: 7cde45800e
am: b8b99e918c

Change-Id: Iaeff001116263d8a722eb94a88c3cb2b32981561