more our forks

Change-Id: I433e94ecc95934470b45ac8e8bd5d19f41fbbd93
fix derp

Change-Id: Ic93332d651d3e61bf8872c7de8e605937a0c5f91
more our fork

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