manual merge now the same
manual merge now the same

After fixing the upsampling, those we can run more tests.

libjxl/libjxl,libjxl/libjxl,libjxl/libjxl,libjxl/libjxl,libjxl/libjxl,libjxl/libjxl,libjxl/libjxl,libjxl/libjxl