Merge "symlink /dev/net/tun -> ../tun" am: 8fda5feb25

Change-Id: I41f02949c240e0a581d0e87b35181644f4faa50f