Support ico image type in emulator
Merge branch 'michael-k-ico'