Merge "Fix java build warnings, mostly unused imports."