Restored armv7s for static library targets