Handle gcc 7 warnings
authorCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Fri, 23 Mar 2018 00:19:51 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 00:19:51 +0000 (00:19 +0000)
am: 3677383919

Change-Id: I4ea9a65bf430fadf5753bf260df13ee7ca250f9c


Trivial merge