track aosp's STK

Change-Id: I64ebfcf5b03a927703036419939f1e2c09fe5917