Merge "Revert "Split Stk into a client apk and a lib.""