Merge "Fix off by 4 error handling eh_frame hdr."
am: 73a2508dc4

Change-Id: Ic5374ce8305b29fa471bd2591a1943918ac74111