Snap for 6209820 from f8135ba3117d47ce70ac52a1a3d41a86aad30eca to r-keystone-qcom-release

Change-Id: I7c930410b084211a98a1c9316d04fe62ced559ee
diff --git a/benchmark_libs/Android.bp b/benchmark_libs/Android.bp
index ea9fa81..6004436 100644
--- a/benchmark_libs/Android.bp
+++ b/benchmark_libs/Android.bp
@@ -21,5 +21,4 @@
     ],
     export_include_dirs: ["."],
     shared_libs: ["liblog"],
-    pack_relocations: false
 }
diff --git a/functional_tests/native/Android.bp b/functional_tests/native/Android.bp
index 6671147..4e2a1b7 100644
--- a/functional_tests/native/Android.bp
+++ b/functional_tests/native/Android.bp
@@ -45,6 +45,5 @@
     test_suites: [
         "device-tests",
     ],
-    pack_relocations: false
 }