Merge "Split Stk into a client apk and a lib."
am: 8bf66cc630

Change-Id: I84062e3730e2f3c6c00cfa7adfb5adfd0e01a717