msm8960: kill this samsung service mode with fire

Change-Id: I8b6a05580ad034c38f2884866d62a57e4a999c4b

Conflicts:

	msm8960.mk
msm8960: Renable CAF media variant

Change-Id: I81144dc9a66b3d16b84bc7f4a450f4138decc64c
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Merge "msm8960: kill this samsung service mode with fire" into kitkat
Merge branch 'kitkat' of github.com:AOKP/device_samsung_msm8960-common into kitkat