Revert "msm8960: update libril from qcril merge"

This reverts commit 480b61724909fe7cdb6ecb54834aa016d7951646.

Conflicts:
	libril/telephony/ril.h