hlte international: bring it up to speed with cm-12.0

Change-Id: I8cb20f5c7813cedc99e136b132fd684082b2a855
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_samsung_hlte into cm-12.0

Conflicts:
	BoardConfig.mk
	ril/telephony/java/com/android/internal/telephony/HlteRIL.java

Change-Id: Iff7601f3782a1afc04a784f76860fef710b37b2e