Merge "Remove unnecessary references to libunwind."