Clean up import statements in java code. No logical changes.