Merge "Revert "Revert "Workaround build breakage from full LTO optimiza..."" into main