Merge "Remove sysfs_gpu type definition"