Merge "Fix AddCurrentRuntimeFeaturesAsDex2OatArguments jit handling"