Merge "Revert "Split Stk into a client apk and a lib."" am: 1070174ee0

Change-Id: I38d05db267c77d935befd2cd48742dc78f9fecb0