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

Fix compiling on GCC9 am: 7e03757b7d am: c3ea2f3793

Change-Id: I7dcced6424a3c04698be2e7bac2dae51986324fc