Merge changes Ib7ccf3a2,Ie6784a22,Ibfbab25a am: ff0c2792e3 am: a4ad1f2637 am: 851ab08c67

Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/2438236

Change-Id: I5c44a20a7dbd4753dad26fee02a193cf2d7574d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>