am d67cc366: resolved conflicts for merge of b40c2385 to jb-mr1.1-dev

* commit 'd67cc366f769a84f56755b12d2c943113ec46f8c':
  Fix a TOCTOU and symlink attack in netd.