Merge "[SDK tools] Support non-ASCII paths in 'mksdcard'" am: 7555c8dedf
am: 204ed95664

Change-Id: I7043f6dc1c18542e835564d8d24a1fc7ae38c026