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

Change-Id: I6b3216482abf0adb443fea7dfbf52d9385005c7c


Trivial merge