diff --git a/Dex2oat_flags_aosp.diff b/Dex2oat_flags_aosp.diff
index fcd611f8e969c767667fa15aa1d2835b508b990c..4da8b2c814cb6eae4c0c5174059aa5fe19c7d76b 100644
--- a/Dex2oat_flags_aosp.diff
+++ b/Dex2oat_flags_aosp.diff
@@ -1,13 +1,14 @@
 diff --git a/compiler/Android.bp b/compiler/Android.bp
-index a1269dcaf..a9b62b474 100644
+index 1e4cdf2bd..e14dce8d7 100644
 --- a/compiler/Android.bp
 +++ b/compiler/Android.bp
-@@ -215,6 +215,8 @@ art_cc_defaults {
-     shared: {
-         shared_libs: ["libcrypto"],
-     },
+@@ -197,6 +197,9 @@ art_cc_defaults {
+         "art_cmdlineparser_headers",  // For compiler_options.
+     ],
+ 
 +    cflags: [CFLAGS_FOR_BENCH_SUITE],
 +    ldflags: [LDFLAGS_FOR_BENCH_SUITE],
++
+     export_include_dirs: ["."],
  }
  
- gensrcs {
diff --git a/Dex2oat_flags_internal.diff b/Dex2oat_flags_internal.diff
index fcd611f8e969c767667fa15aa1d2835b508b990c..2efb1205f03d79df7a77743802852cac2baf165e 100644
--- a/Dex2oat_flags_internal.diff
+++ b/Dex2oat_flags_internal.diff
@@ -1,13 +1,14 @@
 diff --git a/compiler/Android.bp b/compiler/Android.bp
-index a1269dcaf..a9b62b474 100644
+index 1e4cdf2bd5..e14dce8d7b 100644
 --- a/compiler/Android.bp
 +++ b/compiler/Android.bp
-@@ -215,6 +215,8 @@ art_cc_defaults {
-     shared: {
-         shared_libs: ["libcrypto"],
-     },
+@@ -197,6 +197,9 @@ art_cc_defaults {
+         "art_cmdlineparser_headers",  // For compiler_options.
+     ],
+ 
 +    cflags: [CFLAGS_FOR_BENCH_SUITE],
 +    ldflags: [LDFLAGS_FOR_BENCH_SUITE],
++
+     export_include_dirs: ["."],
  }
  
- gensrcs {