Define the old-school arm arch constants we still use internally based on
the somewhat newer constants predefined by the compiler.  This will allow
userland apps to use various machine/foo.h headers without CPUTYPE defined.
Revert a glitched mismerge that got caught up in the prior commit.
The PJ4B family is still armv7, not armv6.