Merge "Update cpe for vulnerability scanners" am: b6fc4c6f3f am: 856c8ccb23 am: d24d6fa62d

Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1914267

Change-Id: I05bd152a5de050903d6c6475a7ff4a4cf5fdc853