am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev

* commit '4f3d31479d5e4e8d35e60de628417cb820d69f5e':
  Add java_args as a valid option