cosmetic: remove compiler warnings
add missing function prototype
remove compiler warning
Merge branch 'v7-stable'

Conflicts:
	runtime/libgcry.h