Add patches for JDK 1.5 errors (tools)
Update for v6.3~svn698-3