DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad

This is until aosp gets the latest libpcap+tcpdump currently only on internal.

This reverts commit 5c68e265ac2bfeb881f9cc87c50f8b947ddbd86c.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build