Revert "Merge "Samsung STK support" into android-4.4"

This reverts commit 28ea799a45ccae52a5b3db2b138b19069d63edb2.