Added mitigation for b/122921367

Without this patch aosp/870566 will cause clang to abort during x86-eng
asan builds (due to b/122921367).  This is being committed separately to
enable easy reversion in the future.

Test: m
Bug: 122921367
Change-Id: Id38a6ccabdcd0da02a53e76c47850e197016e781