Revert "msm8960-common: ril: Avoid collision with RIL constant 1138"

This should have been reverted at the same time as
CyanogenMod/android_hardware_ril@6c5c9563a58da6e0dac554da4a26613b31cb4a1f

This reverts commit c4a0ec453ca9750c0e8e74c3f444c6722c8caffb.

Change-Id: I2b6375537a4713f2eba70a26c2e1bae816e4a10a
Merge remote-tracking branch 'cm/cm-11.0' into HEAD