Total AOKP->AICP conversion

Change-Id: Ied2dad5cbd62db8c111124b2bb0b96fe54053895
Merge "Total AOKP->AICP conversion" into jb-mr2