As long as this requires bundling clcc, not allowing to disable it is
unacceptable.

This reverts commit 3b0b7646.

Conflicts:
	configure.ac

Change-Id: I12b3d5e3325bbd03cd98e1fb5139705d694493c2