Convert to new override syntax

Use the convert-overrides.py to convert to new syntax and fixed
some additional changes manually.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>