Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff" am: 51fd5436a5 am: 04a3a8ab36 am: fc296cc836 am: 1118e6e830 am: 20d68c38f9

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1843663

Change-Id: I2451b6bd41103fcfda5d4823baf95156a532f03c