Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0a50c89812fb0f6e635a02ed4c9db690d749e3cf
Fix a TOCTOU and symlink attack in netd.

Bug: 7530471
Change-Id: I01fc79d647831dea903e4b852b874eb7bbed25fb
Fix a TOCTOU and symlink attack in netd.

Bug: 7530471
Change-Id: I3b0a38a203bdeba6c492a54fded056a16992e34e
am 43682d94: Fix a TOCTOU and symlink attack in netd.

* commit '43682d9474a2c89ddecc9fcc818df40e4f5424ee':
  Fix a TOCTOU and symlink attack in netd.
resolved conflicts for merge of 7b90f090 to jb-mr1-dev

Change-Id: Id5b6598b20f34b5e8d2c90927d2acfae7237e69b
resolved conflicts for merge of b40c2385 to jb-mr1.1-dev

Change-Id: I0cef2141487ffd2cb5694a10e4077c299d9d7df7
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/netd into 1.1

Android 4.2.2 release 1
Merge remote-tracking branch 'CyanogenMod/cm-10.1' into cm-10.1