Make it so ARMv7 isn't a generic target.

Rearranges a bit of code so that ARM isn't a generic build anymore. Because it obviously isn't