Removed CVD dependency and added CImg.

Change-Id: Ia7d9222afe78be2b45bee98cf855cf8ec77c5230
Merge "Removed CVD dependency and added CImg."