Merge "extract_files: Add support for paths without system/" into android-8.0
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index bd8312c..dd195ee 100755
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -873,6 +873,8 @@
             TARGET="$FROM"
             OUTPUT_DIR="$OUTPUT_DIR/rootfs"
             TMP_DIR="$TMP_DIR/rootfs"
+        elif [ -f "$SRC/$FILE" ] && [ "$SRC" != "adb" ]; then
+            TARGET="$FROM"
         else
             TARGET="system/$FROM"
             FILE="system/$FILE"