was broken with 70f56bc2 "java: reduce scope,
make member classes private"

Change-Id: I84a3fafbfdddf6bb04ab7787d344bf50ffd22994
(cherry picked from commit 3b07120a)

Conflicts:
	odk/examples/java/Spreadsheet/CalcAddins.java