Revert "pixman: Update internal copy to pixman master"