AOKP->AICP conversion"" into kitkat

Change-Id: I72dd8dc1a216aae289fb91025bc611b376a0528e