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

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

Change-Id: Ib0952e2189ccb7ab765f6a28e0f5764a333cc518