Merge "Fix handling of PT_GNU_EH_FRAME." am: d76932ffa5
am: ec79999dbf

Change-Id: I0a452cc1e185864efcccf6f2bc47bbbaeeb9c7c4