AOKP->AICP conversion"" into kitkat

Change-Id: Ie223e151413bd00469f20bd2abfbe63cccb96d80