Merge "Fix emu builds"