Update remap-copybit-formats.patch from CAF's patch queue