Roll infra/go/src/github.com/luci/luci-go/ to b85c6dd748361e8244122faac44b5beefcd2db37.

go/src/infra/gae/libs/wrapper/memory/datastore_query.go

Index: go/src/infra/gae/libs/wrapper/memory/datastore_query.go
diff --git a/go/src/infra/gae/libs/wrapper/memory/datastore_query.go b/go/src/infra/gae/libs/wrapper/memory/datastore_query.go
index 8e807be42e1aa219b2f5898bb2194821a0350083..1e4462eacb4b2429b7d800d0a5d6ae29b57e8663 100644
--- a/go/src/infra/gae/libs/wrapper/memory/datastore_query.go
+++ b/go/src/infra/gae/libs/wrapper/memory/datastore_query.go
@@ -15,7 +15,7 @@ import (
 	pb "appengine_internal/datastore"
 
 	"github.com/luci/gkvlite"
-	"github.com/luci/luci-go/common/funnybase"
+	"github.com/luci/luci-go/common/cmpbin"
 
 	"infra/gae/libs/wrapper"
 )
@@ -89,7 +89,7 @@ func (i *qIndex) WriteBinary(buf *bytes.Buffer) {
 	} else {
 		buf.WriteByte(1)
 	}
-	funnybase.WriteUint(buf, uint64(len(i.sortby)))
+	cmpbin.WriteUint(buf, uint64(len(i.sortby)))
 	for _, sb := range i.sortby {
 		sb.WriteBinary(buf)
 	}
@@ -134,7 +134,7 @@ func (i *qIndex) ReadBinary(buf *bytes.Buffer) error {
 	}
 	i.ancestor = anc == 1
 
-	numSorts, err := funnybase.ReadUint(buf)
+	numSorts, _, err := cmpbin.ReadUint(buf)
 	if err != nil {
 		return err
 	}