Merge "Fix glibc 2.15 build."
authorElliott Hughes <enh@google.com>
Thu, 13 Nov 2014 03:37:47 +0000 (03:37 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 13 Nov 2014 03:37:47 +0000 (03:37 +0000)

Trivial merge