General inc updates for AOKP
Revert "Revert "TWRP-ify""

This reverts commit 5a66de7f7dede444184a461624dfad680a640ea2.

Conflicts:
	Manifest/local_manifest.xml