Add support for 'tool' category to ImageRegistryUtil Change-Id: Ie2eff79f16c29d2e0a6134372ccccb64af07ae32