Revert "rild: Don't use the clientId argument with non-qcom hardware"

This reverts commit b0fa0e93ebff5e03ae9a755ea5d541fa3fbc5a85.

(cherry picked from commit c29ab3047468291c43207ecb8db55a1a40c6e8b6)

Conflicts:
	rild/rild.c
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

(cherry picked from commit 318dd27aee7e4de6eadec30094cc6b40735082d9)

Conflicts:
	rild/rild.c
hardware_ril: fix bad samsung proprietary ril init

rild create and pass an additional parameter to RIL_init function.
This force RIL_init, in libsec-ril.so (samsung proprietary ril library),
to give a null pointer (RIL_init fails) and breaks completely RIL.
This should fix this problem. To make this effective it is necessary to
add BOARD_NEEDS_SEC_RIL_WORKAROUND := true in your BoardCommonConfig.mk

PS3: fix typo

Change-Id: I14e66315fa25aa1db05dbe9a03422c63a421205c
(cherry picked from commit 5104df59b83dfb2f0f73a6c1f09c37c888464566)

Conflicts:
	rild/rild.c