Merge "Fix potential bad info in eh_frame_hdr." am: 2ff3c44304 am: dca6c8501f
am: ebb1da8549

Change-Id: I04b858c45b99046e169fc3509196275d0a8f1552