Merge "Cleanup libc symbols for other architectures" am: 295e979535
am: 8ed734c0ef

* commit '8ed734c0ef69ba6e5b72eed063f7aca6dc06a10f':
  Cleanup libc symbols for other architectures