Cherry-pick an upstream patch to fix tests on big-endian