Merge "Add java_args as a valid option" into klp-modular-dev