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

Change-Id: I176dd24b363db336f4f42f8d8c2c5aebb2632dcb


Trivial merge