Android Icon resizing WIP
Fix merge errors
Merge pull request #26 from mozilla/graphicsmagick

Graphicsmagick