Revert "Revert "Revert "Revert "Workaround build breakage from f..."

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

Reason for revert: Reland with fix

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

Change-Id: I83c1dc4ac6b988c6f1fa2a6cb026ef862b0e448a
2 files changed