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

Change-Id: I4b92684b56e5d7466e7dc229375856527c78dc5e


Trivial merge