Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff"