Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"