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

Change-Id: Ia995a73380bf1d25f9aafeea9f25e216a31d194c