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

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