undo build hacks, make recovery dependent on anything that has a target in...

undo build hacks, make recovery dependent on anything that has a target in there (similar to boot image), and dont delete the recovery directory on creating an image. that makes it really difficult to use.