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

Change-Id: Idba1600d3ba26628279032fc34dd44658d9e66f0