Fix build and javadoc.

Change-Id: Icf2d0372a74530ff0fae0c98488767b42f223281
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.