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

* commit '3f14ea331b03c5dd00c12cbd1ccf91fe32779a7d':
  Add java_args as a valid option