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

Change-Id: I6b3f165d7275930708d372d26b93b6c1e44ff1c4