Update releasetools

Merge from cm with some modifications

Conflicts:
	tools/releasetools/edify_generator.py