Merge "Add check to CheckImageIdenticalToOriginalExceptForRelocation"
am: f98a25083c

Change-Id: I184916d8778294c142bdd396253f41ae6c7481f1