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

Change-Id: I6aeb0de40059f630c748a09b0c37eec57cb5ebbd