Merge "Fix linking error for Win64 emulator executable"