Fix imgdiag crashing for ASLR images
am: d3b6664f45

Change-Id: I0d0de7b74d23006ea4cfeee01418f7dccc4a5403