Merge "emulator: fix the build"