Match some Slim files

some things I found missing when comparing our files with theirs..

Change-Id: Ibf9168beac5af6a5153085ced61c23edcc2eb411
Merge commit 'refs/changes/70/770/1' of https://review.carbonrom.org/CarbonDev/android_frameworks_base into kk