Merge "Samsung STK support" into android-4.4

(cherry picked from commit 2edc58f4d8a48f6910111f957028747e3a59bac4)

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml