Merge "The host prebuilt glibc is 2.11, so remove workarounds for 2.9."