Revert "samsung: Remove multiple inclusion of RIL"

This reverts commit 9a80ef74e630e8be091f293f412877eacf8636f8.
Revert "samsung: libril: some code cleanup"

This reverts commit ea4af61a1b3c1199bef63f0f34a5fe8d5f4dd8d0.