Get the IconMerger working again.

Change-Id: I73719f4fd475a39d4c1245de45c6a13c31e6323b
3 files changed