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

Change-Id: Ia685b1ae9948f068502d67bb6afdc1f25b416267