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

Change-Id: I9b27f6353abba8bf47f83570a28bd6160dafe8cf