Squash Merge Android 4.3.1

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

Change-Id: Ia33b8967b0305cdf0addf65603503b4dd6b6a3fe
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>