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

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