Add timer delete support to rild

Change-Id: Ia862f4cac116bf1ee98788c004860cdb2c70f356
merge from open-source master

Change-Id: I0628d21b4bf629896dad7b9b5b6a9357021e1278
New RIL command to fetch PSC of current serving cell.

Bug: 2465036
Change-Id: Iccd177747bb78e2cd5ec6d9d22e47aa0e7bfd64b
Support for fetching PSC of serving cell.

Instead of adding a new RIL command, just extend RIL_REQUEST_REGISTRATION_STATE.

Bug: 2465036
Change-Id: I36c3a7b730cace66621fc513773ec97c453ea619
am 9a2f5113: merge from open-source master

Merge commit '9a2f5113fd1db1e1605daad47b16b6f960045582'

* commit '9a2f5113fd1db1e1605daad47b16b6f960045582':
  Add timer delete support to rild
Revert "am 9a2f5113: merge from open-source master"

This reverts commit bb1375f6bdc6cf7d8c3642367cf35565ddb094a8, reversing
changes made to ca5e347ce4b2b51385c4b7395d51c30498c41a6b.
Merge commit '7edd07c9184a3abfaa3f4a161b74b3da9d7bbd56' into HEAD

* commit '7edd07c9184a3abfaa3f4a161b74b3da9d7bbd56':
  Add timer delete support to rild
Merge commit '563fd7207da27322bf3f3587ef6000a944a617b7' into HEAD

* commit '563fd7207da27322bf3f3587ef6000a944a617b7':
  New RIL command to fetch PSC of current serving cell.

Conflicts:
	include/telephony/ril.h
	libril/ril.cpp
Merge commit 'ca5e347ce4b2b51385c4b7395d51c30498c41a6b' into HEAD

* commit 'ca5e347ce4b2b51385c4b7395d51c30498c41a6b':
  Support for fetching PSC of serving cell.
Merge commit '0d9f0c0ea45a0239653e04f2c63ccecb1bc62c6b' into HEAD

* commit '0d9f0c0ea45a0239653e04f2c63ccecb1bc62c6b':
  Revert "am 9a2f5113: merge from open-source master"
Fix: Mac OS X build.
Patch from Al Sutton
The Android.mk file in hardware/ril/mock-ril defines some variables if and only if the architecuture is arm based. It then has some rules outside the arm "if" statement which uses these variables.

This causes problems when building on a Mac for non-arm targets because the find command in Mac OS mush have a base directory specified (i.e. find dir -name xxx), but due to the missing variables a find is attempted without a base directory (i.e. find -name xxx) which results in an error and the build subsequently failing with an error.

Change-Id: Ie588136e6c39ebff0f5cee04b7f44a4373bc3ca9
Make referenceril optional.
Update to use system/core/include 4.2.2_r1.2
Update to use binary.mk 4.3_r2.1
Remove mockril.

Mock ril isn't being used and the V8 library is being removed,
so mockril is being removed.

Change-Id: I90cc83ac5ee9d06c473c42c847b83798730649de

Conflicts:
	mock-ril/Android.mk
	mock-ril/Makefile
	mock-ril/README.txt
	mock-ril/src/cpp/ctrl_server.cpp
	mock-ril/src/cpp/experiments.cpp
	mock-ril/src/cpp/js_support.cpp
	mock-ril/src/cpp/js_support.h
	mock-ril/src/cpp/mock_ril.cpp
	mock-ril/src/cpp/mock_ril.h
	mock-ril/src/cpp/msgheader.pb.cpp
	mock-ril/src/cpp/node_buffer.cpp
	mock-ril/src/cpp/node_util.cpp
	mock-ril/src/cpp/protobuf_v8.cpp
	mock-ril/src/cpp/requests.cpp
	mock-ril/src/cpp/responses.cpp
	mock-ril/src/js/mock_ril.js
	mock-ril/src/js/ril_vars.js
	mock-ril/src/js/simulated_icc.js
	mock-ril/src/js/simulated_radio.js
	mock-ril/src/js/simulated_radio_tests.js
	mock-ril/src/proto/ctrl.proto
	mock-ril/src/proto/ril.proto