cleanup
Merge git://github.com/htc-msm8960/android_device_htc_m7 into cm-10.1