tree 8ec6a628ece8def55bf8814738d5a4cd5f567010
parent df3f76038810b8ef5760ce049c09546dc1dcf8f7
parent e38ada0bcfeba19369c369ee0c11cab9045fd9f9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583875696 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583875696 +0000

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

Change-Id: Ib5cb7694a0b7f3823c92a73416cb0361c884422b