AOKP->AICP conversion"" into kitkat

Change-Id: Ia2b5f1687bbcd462ca11cc3e45316798c86cb745