Merge "Add an APF unit test to drop all packets in the pcap file" am: 0d9b942292
am: 986597923a

Change-Id: I5c4e39f01621f41421a1159d7af3c670c001aa7a