Revert "AOKP->AICP conversion"

This reverts commit 1e2f1ea398919c7fa186f4648df10a1a2b03e31e.

Change-Id: If917e924372ff909a36483bd3b6a1a62e029c7c1
Merge "Revert "AOKP->AICP conversion"" into kitkat