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

Change-Id: Ic8743e2508ae476ac56c4c1422d8d0d57ad8b671


Trivial merge