Merge "Fix __gnu_Unwind_Find_exidx again."
am: 1a5737a48f

Change-Id: I70bcdb6028e38e630066490fed7c87767664439c