Add armv6hl and fallback from armv7hl to armv6hl