[automerger skipped] clatd: change to pass in tun filedescriptor via command line
am: 8addcc0f63 -s ours
am skip reason: change_id I8c9e235e9a5bf1a1436e8dc3af8d0aa86f6dc1a5 with SHA1 716518d9b9 is in history

Change-Id: I56049d5612c7ffb127b77465e04c193758607bab