Track Stk from AOKP

MSIM commits included!

Change-Id: I846ae6fb0d1819bcc5cb7cf42cbbe183b6f685ee