merge in oc-release history after reset to oc-dev
diff --git a/func_fuzzer/media/omx/V1_0/Android.bp b/func_fuzzer/media/omx/V1_0/Android.bp
index f025afb..5232fec 100644
--- a/func_fuzzer/media/omx/V1_0/Android.bp
+++ b/func_fuzzer/media/omx/V1_0/Android.bp
@@ -165,3 +165,36 @@
     ],
 }
 
+genrule {
+    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxStore_genc++",
+    tools: ["hidl-gen", "vtsc"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
+    srcs: [
+        ":android.hardware.media.omx@1.0_hal",
+    ],
+    out: [
+        "android/hardware/media/omx/1.0/OmxStore.vts.cpp",
+    ],
+}
+
+cc_binary {
+    name: "android.hardware.media.omx@1.0-vts.func_fuzzer.OmxStore",
+    defaults: ["func_fuzzer_defaults"],
+    srcs: [":android.hardware.media.omx@1.0-vts.func_fuzzer.OmxStore_genc++"],
+    shared_libs: [
+        "android.hardware.media.omx@1.0",
+        "libcutils",
+        "liblog",
+        "libutils",
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libhardware",
+        "libvts_func_fuzzer_utils",
+    ],
+    cflags: [
+        "-Wno-unused-parameter",
+        "-fno-omit-frame-pointer",
+    ],
+}
+
diff --git a/func_fuzzer/tests/Android.bp b/func_fuzzer/tests/Android.bp
index 42392fa..fcc1baf 100644
--- a/func_fuzzer/tests/Android.bp
+++ b/func_fuzzer/tests/Android.bp
@@ -6,6 +6,7 @@
     "expression/V1_0",
     "extension/light/V2_0",
     "foo/V1_0",
+    "hash/V1_0",
     "inheritance/V1_0",
     "libhwbinder/V1_0",
     "memory/V1_0",
diff --git a/func_fuzzer/tests/hash/V1_0/Android.bp b/func_fuzzer/tests/hash/V1_0/Android.bp
new file mode 100644
index 0000000..6c87c75
--- /dev/null
+++ b/func_fuzzer/tests/hash/V1_0/Android.bp
@@ -0,0 +1,35 @@
+// This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
+// Do not edit manually.
+genrule {
+    name: "android.hardware.tests.hash@1.0-vts.func_fuzzer.Hash_genc++",
+    tools: ["hidl-gen", "vtsc"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0 && $(location vtsc) -mFUZZER -tSOURCE -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
+    srcs: [
+        ":android.hardware.tests.hash@1.0_hal",
+    ],
+    out: [
+        "android/hardware/tests/hash/1.0/Hash.vts.cpp",
+    ],
+}
+
+cc_binary {
+    name: "android.hardware.tests.hash@1.0-vts.func_fuzzer.Hash",
+    defaults: ["func_fuzzer_defaults"],
+    srcs: [":android.hardware.tests.hash@1.0-vts.func_fuzzer.Hash_genc++"],
+    shared_libs: [
+        "android.hardware.tests.hash@1.0",
+        "libcutils",
+        "liblog",
+        "libutils",
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libhardware",
+        "libvts_func_fuzzer_utils",
+    ],
+    cflags: [
+        "-Wno-unused-parameter",
+        "-fno-omit-frame-pointer",
+    ],
+}
+