Merge "Update cpe for vulnerability scanners" am: 02935b5295 am: 02739ab4a6 am: 57e3b1daf6 am: 0810415273

Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/1913551

Change-Id: Ic44cea10f1ac11d0e5dc62a201ee2838aa8bc4b6