Merge "Revert "Stop libc from cross-referencing unwind symbols""