m7: change vibrator level to 1700mV to match userspace default value

Change-Id: I159e6fa68a180d759bdf9bc044d53a5757ca419b
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_htc_m7.git into cm-10.2
m7: camera: update boardfile to e22f38b

Conflicts:
	arch/arm/mach-msm/board-m7-camera.c
m7: camera: update to e22f38b
m7: htc acoustic: add ACOUSTIC_KILL_PID
m7: htc battery update to e22f38b