Merge "Fix emulator build."