Merge "Fix compilation using javac." into nyc-dev