Merge branch 'open_source' into google_internal

Conflicts:
	core/build_id.mk