Merge "Revert^2 "Workaround Clang hangs indefinitely"" into main am: 9c904707

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



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