Fix armv6j subarch.
Merge branch 'master' of git.funtoo.org:metro