Merge "set O_CLOEXEC on /dev/tun open" am: 68fd19b04c
am: 780ba3226e

Change-Id: I2433ece20b0ac8704e6349c06860a9eec121d14f