tree 8ec6a628ece8def55bf8814738d5a4cd5f567010
parent 784de01db42b33bb234c855c121c9f7904998f68
parent 7f10681d0c1f2ff93ad2b8e6faffe274e77b8e9e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583876363 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583876363 +0000

Fix compiling on GCC9 am: 7e03757b7d am: c3ea2f3793 am: e38ada0bcf am: 7f10681d0c

Change-Id: I41cabcff268d194b3cd2ba17415cd4a39541e4e4