COMP: Fix ImageViewer superbuild configuration.

Change-Id: Ie230e90445d56a1fbeaf2bb05c1d6aa28545e613
Merge topic 'ImageViewerBuild'

936a978 COMP: Fix ImageViewer superbuild configuration.