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

Change-Id: If496a6f0690da479634d61a8642f4abec0172f6a