Fix GPU builds after recent core merges.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Fix GPU builds after recent core merges.

Conflicts:
	src/common-opencl.c
	src/cracker.c