Merge "Fix warnings from gtest under GCC 5 or newer."
authorJames Zern <jzern@google.com>
Fri, 17 Jun 2016 21:18:21 +0000 (21:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 17 Jun 2016 21:18:21 +0000 (21:18 +0000)

Trivial merge