diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1280x720p24f300_3000kbps.hevc b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1280x720p24f300_3000kbps.hevc
new file mode 100644
index 0000000..42b8a10
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1280x720p24f300_3000kbps.hevc
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1280x720p24f300_3000kbps.info b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1280x720p24f300_3000kbps.info
new file mode 100644
index 0000000..543d184
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1280x720p24f300_3000kbps.info
@@ -0,0 +1,15 @@
+      VPS           28
+      SPS           44
+      PPS           11
+      SEI         1678
+      IDR       221667
+      P/B        55581
+      P/B        14406
+      P/B         5950
+      P/B         6148
+      P/B        42976
+      P/B        16742
+      P/B         5384
+      P/B         4646
+      P/B        41293
+      P/B        13867
\ No newline at end of file
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1920x1080p24f300_4500kbps.hevc b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1920x1080p24f300_4500kbps.hevc
new file mode 100644
index 0000000..9e3f1ef
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1920x1080p24f300_4500kbps.hevc
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1920x1080p24f300_4500kbps.info b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1920x1080p24f300_4500kbps.info
new file mode 100644
index 0000000..b733e60
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_1920x1080p24f300_4500kbps.info
@@ -0,0 +1,14 @@
+      VPS         28
+      SPS         45
+      PPS         11
+      SEI       1679
+      IDR     175552
+      P/B      58918
+      P/B      19856
+      P/B       6187
+      P/B       6259
+      P/B      62131
+      P/B      20454
+      P/B       6305
+      P/B       6518
+      P/B      61247
\ No newline at end of file
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_3840x2160p50f300_32500kbps.hevc b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_3840x2160p50f300_32500kbps.hevc
new file mode 100644
index 0000000..bfc9089
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_3840x2160p50f300_32500kbps.hevc
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_3840x2160p50f300_32500kbps.info b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_3840x2160p50f300_32500kbps.info
new file mode 100644
index 0000000..db5b21b
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_3840x2160p50f300_32500kbps.info
@@ -0,0 +1,16 @@
+      VPS             28
+      SPS             45
+      PPS             11
+      SEI           1680
+      IDR         616787
+      P/B         236604
+      P/B          83980
+      P/B          31780
+      P/B          32033
+      P/B         183295
+      P/B          71298
+      P/B          30738
+      P/B          28406
+      P/B         191882
+      P/B          67485
+      P/B          27667
\ No newline at end of file
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_640x360p24f300_500kbps.hevc b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_640x360p24f300_500kbps.hevc
new file mode 100644
index 0000000..3dd16c7
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_640x360p24f300_500kbps.hevc
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_640x360p24f300_500kbps.info b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_640x360p24f300_500kbps.info
new file mode 100644
index 0000000..44896c5
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/HEVCUtilsUnitTest/crowd_640x360p24f300_500kbps.info
@@ -0,0 +1,17 @@
+      VPS       28
+      SPS       43
+      PPS       11
+      SEI     1676
+      IDR    28720
+      P/B     4044
+      P/B      291
+      P/B      232
+      P/B     8277
+      P/B     1402
+      P/B      241
+      P/B      416
+      P/B     7753
+      P/B     1697
+      P/B      302
+      P/B      424
+      P/B     7170
\ No newline at end of file
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/build.sh b/frameworks/av/media/libstagefright/tests/HEVC/build.sh
new file mode 100755
index 0000000..6f0c2f5
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/build.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# build a current zip file
+#
+# parameters
+
+if [ ! -f ./parameters ] ; then
+    echo Missing parameter file parameters
+    exit 1
+fi
+source ./parameters
+
+if [ "${DIR}" = "" ] ; then
+    echo Missing DIR from parameters
+    exit 1
+fi
+if [ "${VERSION}" = "" ] ; then
+    echo Missing VERSION from parameters
+    exit 1
+fi
+
+if [ ! -d "${DIR}" ] ; then
+    echo Missing extractor test data directory: ${DIR}
+    exit 1
+fi
+
+rm -f ${DIR}-${VERSION}.zip
+(cd ./${DIR} && zip -r ../${DIR}-${VERSION}.zip .)
+
+echo all good
diff --git a/frameworks/av/media/libstagefright/tests/HEVC/parameters b/frameworks/av/media/libstagefright/tests/HEVC/parameters
new file mode 100644
index 0000000..f358a23
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/HEVC/parameters
@@ -0,0 +1,3 @@
+DIR=HEVCUtilsUnitTest
+VERSION=1.0
+DEST="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/foundation/tests/HEVCUtils/${DIR}-${VERSION}.zip"