readd goldfish and armv7