Support complex recoveries [cm]

Change-Id: I5ded5023a696a7d1feadd26cab2bd55a0d68fe00

Conflicts:

	tools/releasetools/common.py