Bring inline with CM/implement tweaks
	deleted:    recovery/res  conflicts with CWM Recovery

Change-Id: Ia355910828debb694442b7f97647673a0865b205