Merge "Add updated cpe for vulnerability scanners" am: 9357a1d603 am: 6021e072e7

Original change: https://android-review.googlesource.com/c/platform/external/giflib/+/1912378

Change-Id: I4a32c7f228cb95f1e0dc80039f3d7a9852052885