Merge "Revert "Revert "hwc2: Remove debug.sf.enable_hwc_vds definition."""