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