Backport glibc 2.16 change to 2.15 for mulitlib header conflict