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

Change-Id: Iea43d9914a274db983e2d60595ebfe4db507d137