Fix imgdiag crashing for ASLR images am: d3b6664f45
am: 43cc28e1ea

Change-Id: Ief6c841d02204fa5a3ded8d4e53f66a5559b4d0d