deleted:    recovery/res  conflicts with CWM Recovery

Change-Id: Ia355910828debb694442b7f97647673a0865b205
HACK: Disable secure discard
 * Secure discard is causing wipes to take insane amounts of time.
 * Enable this workaround until the problem is sorted.

Change-Id: If9bbb27fd5476a160e9d7e8b29ab20a851410ff7