Update cadvisor and hcsshim versions

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

vendor/github.com/google/cadvisor/machine/machine.go

@@ -21,8 +21,6 @@ import (
 	"path"
 	"regexp"
 
-	// s390/s390x changes
-	"runtime"
 	"strconv"
 	"strings"
 
@@ -223,10 +221,6 @@ func GetMachineSwapCapacity() (uint64, error) {
 
 // GetTopology returns CPU topology reading information from sysfs
 func GetTopology(sysFs sysfs.SysFs) ([]info.Node, int, error) {
-	// s390/s390x changes
-	if isSystemZ() {
-		return nil, getNumCores(), nil
-	}
 	return sysinfo.GetNodesInfo(sysFs)
 }
 
@@ -290,15 +284,3 @@ func isRiscv64() bool {
 func isMips64() bool {
 	return strings.Contains(machineArch, "mips64")
 }
-
-// s390/s390x changes
-func getNumCores() int {
-	maxProcs := runtime.GOMAXPROCS(0)
-	numCPU := runtime.NumCPU()
-
-	if maxProcs < numCPU {
-		return maxProcs
-	}
-
-	return numCPU
-}