AOKP->AICP conversion

Change-Id: Iebe489dff807619e49167eb9b8d88e9ddfcdaf55