(cherry picked from commit cf2106da2cae9ea158c2aec59ccb0c0754a8688b)

Conflicts:
	contrib/src/gcrypt/rules.mak