Revert "Revert "Revert "Workaround build breakage from full LTO ..."

Revert submission 3009938-revert-3002586-revert-2988057-default-full-lto-DWADZBGWJG-UPWNCWKHFI

Reason for revert:  b/331528903

Reverted changes: /q/submissionid:3009938-revert-3002586-revert-2988057-default-full-lto-DWADZBGWJG-UPWNCWKHFI

Change-Id: Id71726b1e4d96b60ade2fba49d99b776ef7834ea
2 files changed