Revert^2 "Workaround Clang hangs indefinitely"

This reverts commit 64a1b6a57d3a3f6bdda44dd02bbc32397a452575.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/353410480. Will be verifying through ABTD before submission.

Change-Id: Iec3b4303b4f16943c163b36ced0166fb06a51d8f
1 file changed