am 38fea25c: am b991d334: Merge "Read JDWP options from runtime"

* commit '38fea25c3685d0a8db04149966687f0c73acf01c':
  Read JDWP options from runtime