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

Change-Id: Ibdf2075f3b0baaf63d368ba16f440a432fbdaaed