usr our fork of art

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