Issue #5993: Remove armv7s architecture