Merge "[SDK tools] Use a better type name for encoded characters" into emu-master-dev