Add correct detection of armv6hl and armv7hl architectures.