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

Change-Id: Ib4da08878303082b29708f585e5f8c9eac6b9b37