Merge "Workaround global ThinLTO build break"