[automerger skipped] Fix imgdiag crashing for ASLR images
am: 111970844c -s ours
am skip reason: change_id I85a5625a60112471778d86a7d00af0b42bc2ef8c with SHA1 d3b6664f45 is in history

Change-Id: I4eb29dd794b869df697af33579705063c9679f56