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

Change-Id: I0319d8c2436a08dc62fc44a1d0b8dfa158f27115