wrong merge conflict resolution, vcldemo, icontest go to instdir

Change-Id: Iefcca922fc824877c49a11cd68023d57eff22d2f