Revert "Bug 897727: no emulator multiarch" for emulator test failures

This reverts commit 4f97016504df559e0ed25f5f867e820e882cdbf8.