Merge "Add updated cpe for vulnerability scanners" am: bab6c61912 am: 102af0db21

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/1912482

Change-Id: I135656313e96c01d7340d905a13e62814390cc94