Fix imgdiag crashing for ASLR images
am: 111970844c

Change-Id: Ica60fb75af80fd2c77e470c28c7ca98c2bb95945