Revert "Fix derp in new v7a-neon config"

This reverts commit e65a9f214a3b141d9a09b751739d2d4fe7725afa.
Revert "Fixup armv8-a building, and make multiarch builds work"

This reverts commit b9c750dbf8d30c2dbe71871892eab7f495372548.