bring updater-script up to speed with new recovery functions

Conflicts:
	META-INF/com/google/android/updater-script