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

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