general clean up

Change-Id: If3ff32a3974368d9ea2756d3d9a22d4713e704fa
msm8960: add back crt effect

Change-Id: I2979be77aff098fcd429dae63c085e496bcc9598
Merge branch 'cm-10.1' into martincz