Remove unneeded copy of ecj-gcj 3.6 and synchronise 4.2 with changes in main tree.

Package-Manager: portage-2.2.0_alpha188
Manifest-Sign-Key: 248BDC07