Revert "  AOKP->AICP conversion"

This reverts commit 535fae5ac984ae13aa0f4cc8e8eea74847d12de9.

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