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

Conflicts:
	core/build_id.mk

Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a