usr our frameworks/rs

Change-Id: I3bf0dc17a30599da484e145a703c2e30932f22b2
Merge branch 'kitkat' into kk-ssh