Merge "Fix off by 4 error handling eh_frame hdr." am: 73a2508dc4 am: 5384c29b55
am: 67abf042d2

Change-Id: I26a90125010791fdd9b98db920f873d05a9b7c29