Remove redundant file.
Add -mcpu to two X86 tests.

These tests are failing on Haswell CPUs due to different instruction selection.