Merge "Revert "Workaround Clang hangs indefinitely"" into main am: 0480a2e8 am: 4d305844

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3174243



Change-Id: I33d5173e5e2d466b7fe4f62f50d23700f60f7853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>