general clean up

Change-Id: If3ff32a3974368d9ea2756d3d9a22d4713e704fa
Merge commit 'refs/changes/71/45571/1' of http://review.cyanogenmod.org/CyanogenMod/android_device_samsung_jf-common into cm-10.1