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

Change-Id: I3edea2f3738764d486a7b60a8f13697396d2ef7d