am 2223e3c2: Merge change 1797 into donut

Merge commit '2223e3c2706a0c77b12a4526c78ce1611a641605'

* commit '2223e3c2706a0c77b12a4526c78ce1611a641605':
  Remove tcpdump from the old location (it's now in system/xbin)