all: merge master into release-branch.go1.6

Change-Id: Ie2a999e36ee654c1217bd03f720791360f66718d

diff --cc misc/nacl/testzip.proto
index c8ab18ea20e7aa4fe94da66e4b3fe812a172ffd9,dcb156350afe344930d8da39d954dcbb491812ab..4e82ac9b4bff89e9803a978494d28c19879aaa22
--- 1/misc/nacl/testzip.proto
--- 2/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@@ -32,18 -44,9 +44,6 @@@ go   src=.
                                gofmt_test.go
                                testdata
                                        +
-                       vendor
-                               golang.org
-                                               x
-                                                       arch
-                                                               arm
-                                                                       armasm
-                                                                               testdata
-                                                                                               +
-                                                               x86
-                                                                       x86asm
-                                                                               testdata
-                                                                                               +
 -                      newlink
 -                              testdata
 -                                      +
                archive
                        tar
                                testdata