AOKP->AICP conversion

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