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

Change-Id: Icf0c152a839ff1de7259784ec82fa0be77cd76a6


Trivial merge