tcpdump: Include tcpdump in builds

Enable inclusion of tcpdump for user and userdebug build variants

CRs-fixed: 665103
Change-Id: I8d88f4bbd8bc238e61b67247184913ab1d4d16ba
Merge remote-tracking branch 'cm/cm-12.0' into HEAD