New branch for AOKP
Revert "New branch for AOKP"

This reverts commit 63908bbc8fe1ffc2bf7be6880013bc8de02a8346.
Updated for Changes in CarbonDev manifest