Merge "Add check to CheckImageIdenticalToOriginalExceptForRelocation" am: f98a25083c
am: 59a4ad8229

Change-Id: I15676bb1c2d497fb381790357c0baa82300d30e1