Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release

Conflicts:
	core/build_id.mk

Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a
diff --git a/core/build_id.mk b/core/build_id.mk
index 212ed4e..27a7d5d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -19,4 +19,5 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=GRJ90B
+export BUILD_ID=GWK15E
+