Suppress new warnings from gcc-6
authorChris Forbes <chrisforbes@google.com>
Sat, 20 Jan 2018 00:44:45 +0000 (00:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 20 Jan 2018 00:44:45 +0000 (00:44 +0000)
am: 9a58d041fe

Change-Id: I8c63a7707753af0f3a568e0e3988acc848a9d2b3


Trivial merge