Merge "Our prebuilt host glibc is new enough to remove a workaround." am: 3227c90e am: 03ce8705 am: 4e4c7c0e am: 1e435b68 Change-Id: Iafdcda9c9ec97670ebe85426c50271905c35d69b