google samsung mfd upgrade

Conflicts:
	jflter970/proprietary/lib/libril-qc-qmi-1.so
	jflter970/proprietary/lib/libril.so

Change-Id: I81092439ac662561652f289cb43ff1ac3d20541a