Merge "Fix Windows space-in-path handling for 'emulator'." into tools_r13