Reland: Refactor current GAE abstraction library to be free of the SDK*

go/src/infra/gae/libs/gae/context.go

Index: go/src/infra/gae/libs/gae/context.go
diff --git a/go/src/infra/gae/libs/wrapper/context.go b/go/src/infra/gae/libs/gae/context.go
similarity index 67%
rename from go/src/infra/gae/libs/wrapper/context.go
rename to go/src/infra/gae/libs/gae/context.go
index 8adec69df84c6887010cf6adb1607d0947216bc4..f8a458a281367f93dd24a9c66529869b7e62c1b6 100644
--- a/go/src/infra/gae/libs/wrapper/context.go
+++ b/go/src/infra/gae/libs/gae/context.go
@@ -2,17 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package wrapper
+package gae
 
 type key int
 
 var (
 	globalInfoKey key
 
-	datastoreKey key = 1
-	memcacheKey  key = 2
-	taskQueueKey key = 3
+	rawDatastoreKey key = 1
+	memcacheKey     key = 2
+	taskQueueKey    key = 3
+
+	datastoreKey key = 4
 
-	timeNowKey  key = 4
 	mathRandKey key = 5
 )