Replace regex that was particular to armv6 with one that will also
include armv7. This is part of a larger sweep to fix all such regexes
in the tree.

It won't really matter until the build is fixed for armv[67] but the
bad usages need to be removed.

Approved by: portmgr (tier-2 blanket)