Fix armv7s detection