track our own netd
Merge remote-tracking branch 'origin/kitkat' into blood