Merge "Refactor code so that JIT can parse compiler options." am: f31f9739e6
am: 08a097e346

* commit '08a097e346e6631a114a37a37a5cd54dd1faeb8f':
  Refactor code so that JIT can parse compiler options.