Merge "Fix __gnu_Unwind_Find_exidx again." am: 1a5737a48f
am: 4067bf9e3a

Change-Id: Ibc27372557f97f9262bcfcfb6a189807ed046c09