m7: init: cleanup

Change-Id: I88efdee2689b6a4ad64fb854f6371b1584963d68
m7: init: optimize proximity calibration

Change-Id: Iaeb3017d1a7a597070c6e18c2926b59fec874df9
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_device_htc_m7-common into jb3