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

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

Change-Id: I2f3a0b73b2a618cc9d49ca9c03e9f731759c6a54