revendor runc + runtime-spec to match containerd 8e1a04ff9ee3

Note that various fields have changed moved around in the JSON as a result:

* `Platform` has been removed.
* `Process` is now a pointer.
* `OOMScoreAdj` has moved into `Process`, from `Linux.Resources` (resolving a
  TODO here).

Also updates golang.org/x/sys which is less critical.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>

src/moby/config.go

@@ -765,12 +765,7 @@ func ConfigInspectToOCI(yaml Image, inspect types.ImageInspect, idMap map[string
 
 	oci.Version = specs.Version
 
-	oci.Platform = specs.Platform{
-		OS:   inspect.Os,
-		Arch: inspect.Architecture,
-	}
-
-	oci.Process = specs.Process{
+	oci.Process = &specs.Process{
 		Terminal: false,
 		//ConsoleSize
 		User: specs.User{
@@ -792,8 +787,7 @@ func ConfigInspectToOCI(yaml Image, inspect types.ImageInspect, idMap map[string
 		Rlimits:         rlimits,
 		NoNewPrivileges: assignBool(label.NoNewPrivileges, yaml.NoNewPrivileges),
 		// ApparmorProfile
-		// TODO FIXME this has moved in runc spec and needs a revendor and update
-		//OOMScoreAdj: assignIntPtr(label.OOMScoreAdj, yaml.OOMScoreAdj),
+		OOMScoreAdj: assignIntPtr(label.OOMScoreAdj, yaml.OOMScoreAdj),
 		// SelinuxLabel
 	}