am 400153fc: resolved conflicts for merge of 6b2007aa to lmp-mr1-dev-plus-aosp

* commit '400153fc8d1ae20a2fabec36e3144e7623f282d4':
  Move send_tun into tun.c as well.