Fix Samsung STK code for msim

Change-Id: I726f03351f42ce58b8387fad20adfac224c28199
Merge remote-tracking branch 'cm/cm-11.0' into HEAD