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

Change-Id: I29cf70cab6b4c28891dce2a3ccf18b690ff568a0

diff --cc src/crypto/rsa/pkcs1v15_test.go
Simple merge

diff --cc src/crypto/sha1/sha1.go
Simple merge

diff --cc src/crypto/sha256/sha256.go
index 8e4915a7d880dff4d4c29216c7a65a2c2aaff256,e1cccf65a60307517d7adecf7dcefdbd47d88aa5..faf29f25adb6f05c2346213de7e8516e6d51bd3a
--- 1/src/crypto/sha256/sha256.go
--- 2/src/crypto/sha256/sha256.go
+++ b/src/crypto/sha256/sha256.go
@@@ -8,7 -8,7 +8,8 @@@ package sha25
  
  import (
        "crypto"
 +      "crypto/internal/boring"
+       "encoding/binary"
        "errors"
        "hash"
  )

diff --cc src/crypto/sha512/sha512.go
index 394e001eee70f7c548028ef615f5bd6d7640efcf,9c143a2a2817786095b94b2775db18210ff3a7be..3fefd65c657b0b5a4413ab181b6a3c63ab64ca06
--- 1/src/crypto/sha512/sha512.go
--- 2/src/crypto/sha512/sha512.go
+++ b/src/crypto/sha512/sha512.go
@@@ -12,7 -12,7 +12,8 @@@ package sha51
  
  import (
        "crypto"
 +      "crypto/internal/boring"
+       "encoding/binary"
        "errors"
        "hash"
  )