MT#4483 Move acc patch to the upstream directory.