Squash 4.3 changes.

PS2
  Fix derp

Conflicts:
	include/telephony/ril.h
	reference-ril/reference-ril.c
	rild/rild.c

Change-Id: I506317ef21beee506178d943323e76fd5946a8d8