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

Change-Id: I73ed7c960fdc28795c50d12e504097940fffad9f


Trivial merge