Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'"