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

Change-Id: I6c48d554d080eca12650c66cca00c32bd34231f2


Trivial merge