Merge "Revert "Add an MMX fwht4x4""