am 1d8587fe: Merge "Fix AddCurrentRuntimeFeaturesAsDex2OatArguments jit handling"

* commit '1d8587fe1d98909b4949282f14c0334085fdc964':
  Fix AddCurrentRuntimeFeaturesAsDex2OatArguments jit handling