Merge "Cleanup libc symbols for other architectures"