otter-common: Remove redundant packages

Change-Id: Ib5523575062a20e8d3c9b96e628e6aaf6be21bb8
Revert "otter-common: Hide reboot to recovery option in Reboot menu until it works"

This reverts commit 992ffa14870d60a2a7253060d538d95fb94f66e8.

depend on:

http://review.cyanogenmod.org/#/c/58641/
http://review.cyanogenmod.org/#/c/58642/

Change-Id: I6ede743e547f8fa250c43d15e7252c947e24db34
Merge "otter-common: Remove redundant packages" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0