Revert "combo: improve armv7-a flags"

This reverts commit bd3b56a98fd535c224a4546a64ca3014ffce4e37.