Merge "emulator: oops, really fix the build"