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

Change-Id: Ief38a7092c5f0b6fbdc19c1a8023e3388a735764