tree 45fbb1e3fd16f0443ca1c0e7e169a77d42029021
parent f0e80afafbe714f5a92b34ae8b62cab5322179ce
author Joshua Duong <joshuaduong@google.com> 1686275910 +0000
committer Copybara-Service <copybara-worker@google.com> 1709699851 -0800

Fix odr-violation. am: 8825a4caf0 am: 87e51cd717 am: d0d0b6059c am: fa66a7c789 am: f2eb391f94 am: 992992b371

Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2619247

Change-Id: I3e95aaba1eb519846e07089d9e843103bcbb8673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: 866900333efbe8687ff4e2b8eef567be2ce39e18