Merge "__ARM_ARCH__ is always >= 6."