Fixed valid_architecture setting to also include armv7s and arm64