[automerger skipped] Merge "Split Stk into a client apk and a lib." am: 8bf66cc630 am: de6d428a50
am: c6a35482ed -s ours
am skip reason: change_id I0275115747f51bb6d97f1cbe1501aefc3caf0ca7 with SHA1 7e1566067f is in history

Change-Id: Ib96b2a247daf64d54c97b8b917fdc65911c70fad