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

Change-Id: I32c3b40b9e2786d217e28ea8330b3a67b2d11c08


Trivial merge