Merge "Remove definitions that are now in bionic libc"