Add recovery back
Merge branch 'jellybean3' of github.com:TheCollective/platform_manifest into jellybean3

Add recovery back