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

This reverts commit c4a0ec453ca9750c0e8e74c3f444c6722c8caffb.
Revert "msm8960: update libril from qcril merge"

This reverts commit 480b61724909fe7cdb6ecb54834aa016d7951646.