remove some AOSP from our AOKP

Change-Id: I6dd48866776beb9d1bec2a10f7efac492b6bbf9b
Merge "remove some AOSP from our AOKP" into jb43