Remove some redundant armv7 defines. Also, a stray QFile include.