Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'" into emu-master-dev