Samsung STK support

Change-Id: I08d169bc466df290fca838b09f6b0fbea2ac82a8

Conflicts:
	telephony/java/com/android/internal/telephony/RILConstants.java

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	telephony/java/com/android/internal/telephony/RILConstants.java
remove old unused configs
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Create UPSTREAMS
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge branch 'cm-12.0' of https://github.com/ArchiDroid/android_frameworks_base into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

Conflicts:
	core/res/res/values/config.xml
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-12.0
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-12.0
Revert "remove old unused configs"

This reverts commit faf4ead54492901f50bb7d51f0e86f9789e3a716.
Revert "Samsung STK support"

This reverts commit cb6efca6ddf88618bd879b28ebfa6f996eafff70.

Conflicts:
	core/res/res/values/config.xml
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0