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

Change-Id: I3f89284020efc2235fd05224521c70b6676fe852