GAE CL for luci-go common refactor

service/datastore/serialize/serialize.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package serialize
 
 import (
         "bytes"
         "errors"
         "fmt"
         "sort"
         "time"
 
         "github.com/luci/gae/service/blobstore"
         ds "github.com/luci/gae/service/datastore"
-        "github.com/luci/luci-go/common/cmpbin"
-        "github.com/luci/luci-go/common/stringset"
+        "github.com/luci/luci-go/common/data/cmpbin"
+        "github.com/luci/luci-go/common/data/stringset"
 )
 
 // MaxIndexColumns is the maximum number of sort columns (e.g. sort orders) that
 // ReadIndexDefinition is willing to deserialize. 64 was chosen as
 // a likely-astronomical number.
 const MaxIndexColumns = 64
 
 // WritePropertyMapDeterministic allows tests to make WritePropertyMap
 // deterministic.
 var WritePropertyMapDeterministic = false
@@ skipping 584 matching lines @@
         }
 }
 
 func recoverTo(err *error) {
         if r := recover(); r != nil {
                 if rerr := r.(parseError); rerr != nil {
                         *err = error(rerr)
                 }
         }
 }