Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 3513ade8c0 am: 706c15f6b1 am: bb5e8f4645

Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1956012

Change-Id: Ica677ef9ff072edccb0ee71ca4ff9942141a6b05