Revert "Revert "Samsung STK support""

This reverts commit b99b3b0b1a2a7a856820696a90622566342724ba

Change-Id: Id55fee18a9785d9a146e860377772d7fe2463ace
Merge "Revert "Revert "Samsung STK support""" into jellybean