AOKP -> AICP conversion

fixup m7 build

Change-Id: I9d855340a727ad06eab484a1ed0907659b69a51b