which I messed up in commit 70f56bc2
"java: reduce scope, make member classes private"

Change-Id: I817b2a571e2124f551ccd5c0d8e1099d89f0ec46