Merge "Move to new glibc in the tree."
am: 923917226c

Change-Id: I4fbb24390646f8e7d1530a0a721245e0caf195b8