am e0962d5a: am bdc2e318: Add java_args as a valid option

* commit 'e0962d5a25d2bc3349cbc0d755dee8c70ee37417':
  Add java_args as a valid option