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

Change-Id: I67d5e90f17304541cf4416eb586f8531ac27b114


Trivial merge