Revert "stk3x1x from stock"

This reverts commit a9b261db81b3aef08548fe87be4e7027d39c0a2f.

Change-Id: Ia96f130619d1c2634d8f856c24740901e0b6674d
Merge "Revert "stk3x1x from stock"" into castest