Galaxys2-common: add back SamsungServiceMode

Change-Id: I9096f7e048005bb9de52ea5f3053578e31aadf04
Merge branch 'android-4.4' of https://github.com/omnirom/android_device_samsung_galaxys2-common into omnirom-android-4.4

Conflicts:
	common.mk