added failonerror and fork to build files and a small fix for the javagenerator
Merge branch 'master' into jdk6backport(android)