[automerger skipped] Merge "Revert "Split Stk into a client apk and a lib."" am: 1070174ee0 am: cd5a729d6c -s ours am: 903bd540fb -s ours am: 01e79c2011 -s ours
am skip reason: Change-Id I9f5682f99c73c447a5af8d29ed662f1bd68a0bf6 with SHA-1 d51bbb5c35 is in history

Change-Id: I8c1bd0214ae4795e4f3de42a561494df7f8c29b3