Merge "Fix build breakage on non-linux"