Fix Samsung STK code for msim

Change-Id: I726f03351f42ce58b8387fad20adfac224c28199
Merge branch 'cm-11.0' into kk_mkt