(cherry picked from commit 55e203a0)

Conflicts:
	configure.ac
	distro-configs/LibreOfficeOssFuzz.conf

Change-Id: I9137dc0030c3c752ffc0931721bf6b0013309d39