[VP] Remove dupliatcated defines on composition.

Remove duplicated defines and revert part codes from change https://gerrit-gfx.intel.com/#/c/516498

Change-Id: Iccc0d3a3aaed09e3498dc03fb340dbf35b62ce1c
1 file changed