[dev.boringcrypto] all: merge master into dev.boringcrypto

Conflicts due to crypto/internal/cipherhw removal:
	src/crypto/aes/cipher_amd64.go
	src/crypto/internal/cipherhw/cipherhw_amd64.go
	src/go/build/deps_test.go

This removes the AESGCMSupport patch, as there is no equivalent place
for it. The logic will be added back in the next change.

Change-Id: I8169069ff732b6cd0b56279c073cf5e0dd36959d

diff --cc src/cmd/go/go_test.go
Simple merge

diff --cc src/cmd/go/internal/load/pkg.go
Simple merge

diff --cc src/cmd/link/internal/ld/lib.go
Simple merge

diff --cc src/crypto/aes/cipher_amd64.go
index fcdebabb33b48c0444d813fc08f3cab5d6cd895f,4b3b877cd72b41f585f76448a562f2f9720dd725..7efab31065d2fafb7faf9febc2bfd78e94c74fef
--- 1/src/crypto/aes/cipher_amd64.go
--- 2/src/crypto/aes/cipher_amd64.go
+++ b/src/crypto/aes/cipher_amd64.go
@@@ -6,8 -6,7 +6,8 @@@ package ae
  
  import (
        "crypto/cipher"
-       "crypto/internal/cipherhw"
 +      "crypto/internal/boring"
+       "internal/cpu"
  )
  
  // defined in asm_amd64.s

diff --cc src/crypto/tls/common.go
Simple merge

diff --cc src/crypto/x509/verify.go
Simple merge

diff --cc src/go/build/deps_test.go
index f3782f8a8901277a6ecae6cedda16c332d756d3a,9aebd7327a9dad78a1d199966edee0cf8b94fbcc..33a269a62e9375a8892c267fc191d4b40ca5f831
--- 1/src/go/build/deps_test.go
--- 2/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -125,9 -120,6 +125,8 @@@ var pkgDeps = map[string][]string
                "L2",
                "crypto",
                "crypto/cipher",
-               "crypto/internal/cipherhw",
 +              "crypto/internal/boring",
 +              "crypto/internal/boring/fipstls",
                "crypto/subtle",
                "encoding/base32",
                "encoding/base64",
@@@ -237,49 -229,49 +236,49 @@@
        "go/types":                  {"L4", "GOPARSER", "container/heap", "go/constant"},
  
        // One of a kind.
--      "archive/tar":                    {"L4", "OS", "syscall", "os/user"},
--      "archive/zip":                    {"L4", "OS", "compress/flate"},
--      "container/heap":                 {"sort"},
--      "compress/bzip2":                 {"L4"},
--      "compress/flate":                 {"L4"},
--      "compress/gzip":                  {"L4", "compress/flate"},
--      "compress/lzw":                   {"L4"},
--      "compress/zlib":                  {"L4", "compress/flate"},
--      "context":                        {"errors", "fmt", "reflect", "sync", "time"},
--      "database/sql":                   {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"},
--      "database/sql/driver":            {"L4", "context", "time", "database/sql/internal"},
--      "debug/dwarf":                    {"L4"},
--      "debug/elf":                      {"L4", "OS", "debug/dwarf", "compress/zlib"},
--      "debug/gosym":                    {"L4"},
--      "debug/macho":                    {"L4", "OS", "debug/dwarf"},
--      "debug/pe":                       {"L4", "OS", "debug/dwarf"},
--      "debug/plan9obj":                 {"L4", "OS"},
--      "encoding":                       {"L4"},
--      "encoding/ascii85":               {"L4"},
--      "encoding/asn1":                  {"L4", "math/big"},
--      "encoding/csv":                   {"L4"},
--      "encoding/gob":                   {"L4", "OS", "encoding"},
--      "encoding/hex":                   {"L4"},
--      "encoding/json":                  {"L4", "encoding"},
--      "encoding/pem":                   {"L4"},
--      "encoding/xml":                   {"L4", "encoding"},
--      "flag":                           {"L4", "OS"},
--      "go/build":                       {"L4", "OS", "GOPARSER"},
--      "html":                           {"L4"},
--      "image/draw":                     {"L4", "image/internal/imageutil"},
--      "image/gif":                      {"L4", "compress/lzw", "image/color/palette", "image/draw"},
--      "image/internal/imageutil":       {"L4"},
--      "image/jpeg":                     {"L4", "image/internal/imageutil"},
--      "image/png":                      {"L4", "compress/zlib"},
--      "index/suffixarray":              {"L4", "regexp"},
--      "internal/singleflight":          {"sync"},
--      "internal/trace":                 {"L4", "OS"},
--      "math/big":                       {"L4"},
--      "mime":                           {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
--      "mime/quotedprintable":           {"L4"},
--      "net/internal/socktest":          {"L4", "OS", "syscall", "internal/syscall/windows"},
--      "net/url":                        {"L4"},
--      "plugin":                         {"L0", "OS", "CGO"},
++      "archive/tar":              {"L4", "OS", "syscall", "os/user"},
++      "archive/zip":              {"L4", "OS", "compress/flate"},
++      "container/heap":           {"sort"},
++      "compress/bzip2":           {"L4"},
++      "compress/flate":           {"L4"},
++      "compress/gzip":            {"L4", "compress/flate"},
++      "compress/lzw":             {"L4"},
++      "compress/zlib":            {"L4", "compress/flate"},
++      "context":                  {"errors", "fmt", "reflect", "sync", "time"},
++      "database/sql":             {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"},
++      "database/sql/driver":      {"L4", "context", "time", "database/sql/internal"},
++      "debug/dwarf":              {"L4"},
++      "debug/elf":                {"L4", "OS", "debug/dwarf", "compress/zlib"},
++      "debug/gosym":              {"L4"},
++      "debug/macho":              {"L4", "OS", "debug/dwarf"},
++      "debug/pe":                 {"L4", "OS", "debug/dwarf"},
++      "debug/plan9obj":           {"L4", "OS"},
++      "encoding":                 {"L4"},
++      "encoding/ascii85":         {"L4"},
++      "encoding/asn1":            {"L4", "math/big"},
++      "encoding/csv":             {"L4"},
++      "encoding/gob":             {"L4", "OS", "encoding"},
++      "encoding/hex":             {"L4"},
++      "encoding/json":            {"L4", "encoding"},
++      "encoding/pem":             {"L4"},
++      "encoding/xml":             {"L4", "encoding"},
++      "flag":                     {"L4", "OS"},
++      "go/build":                 {"L4", "OS", "GOPARSER"},
++      "html":                     {"L4"},
++      "image/draw":               {"L4", "image/internal/imageutil"},
++      "image/gif":                {"L4", "compress/lzw", "image/color/palette", "image/draw"},
++      "image/internal/imageutil": {"L4"},
++      "image/jpeg":               {"L4", "image/internal/imageutil"},
++      "image/png":                {"L4", "compress/zlib"},
++      "index/suffixarray":        {"L4", "regexp"},
++      "internal/singleflight":    {"sync"},
++      "internal/trace":           {"L4", "OS"},
++      "math/big":                 {"L4"},
++      "mime":                     {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
++      "mime/quotedprintable":     {"L4"},
++      "net/internal/socktest":    {"L4", "OS", "syscall", "internal/syscall/windows"},
++      "net/url":                  {"L4"},
++      "plugin":                   {"L0", "OS", "CGO"},
        "runtime/pprof/internal/profile": {"L4", "OS", "compress/gzip", "regexp"},
        "testing/internal/testdeps":      {"L4", "internal/testlog", "runtime/pprof", "regexp"},
        "text/scanner":                   {"L4", "OS"},