new file mode 100644
--- /dev/null
+++ b/media/libstagefright/binding/mp4parse/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "mp4parse"
+version = "0.4.0"
+authors = [
+  "Ralph Giles <giles@mozilla.com>",
+  "Matthew Gregan <kinetik@flim.org>",
+]
+
+description = "Parser for ISO base media file format (mp4)"
+license = "MPL-2.0"
+
+repository = "https://github.com/mozilla/mp4parse-rust"
+
+# Cargo includes random files from the working directory
+# by default! Avoid bloating the package with test files.
+exclude = [
+  "*.mp4",
+]
+
+build = "build.rs"
+
+[dependencies]
+byteorder = "0.5.0"
+afl = { version = "0.1.1", optional = true }
+afl-plugin = { version = "0.1.1", optional = true }
+abort_on_panic = { version = "1.0.0", optional = true }
+
+[dev-dependencies]
+test-assembler = "0.1.2"
+
+[build-dependencies]
+rusty-cheddar = "0.3.2"
+
+[features]
+fuzz = ["afl", "afl-plugin", "abort_on_panic"]
+
+# Somewhat heavy-handed, but we want at least -Z force-overflow-checks=on.
+[profile.release]
+debug-assertions = true

new file mode 100644
--- /dev/null
+++ b/media/libstagefright/binding/mp4parse/build.rs
@@ -0,0 +1,12 @@
+extern crate cheddar;
+
+fn main() {
+    // Generate mp4parse.h.
+    cheddar::Cheddar::new().expect("could not read manifest")
+        .module("capi").expect("invalid module path")
+        .insert_code("// THIS FILE IS AUTOGENERATED BY mp4parse-rust/build.rs - DO NOT EDIT\n\n")
+        .insert_code("// This Source Code Form is subject to the terms of the Mozilla Public\n")
+        .insert_code("// License, v. 2.0. If a copy of the MPL was not distributed with this\n")
+        .insert_code("// file, You can obtain one at https://mozilla.org/MPL/2.0/.")
+        .run_build("include/mp4parse.h");
+}

rename from media/libstagefright/binding/mp4parse/boxes.rs
rename to media/libstagefright/binding/mp4parse/src/boxes.rs

rename from media/libstagefright/binding/mp4parse/byteorder/mod.rs
rename to media/libstagefright/binding/mp4parse/src/byteorder/mod.rs

rename from media/libstagefright/binding/mp4parse/byteorder/new.rs
rename to media/libstagefright/binding/mp4parse/src/byteorder/new.rs

rename from media/libstagefright/binding/mp4parse/capi.rs
rename to media/libstagefright/binding/mp4parse/src/capi.rs

rename from media/libstagefright/binding/mp4parse/lib.rs
rename to media/libstagefright/binding/mp4parse/src/lib.rs

rename from media/libstagefright/binding/mp4parse/tests.rs
rename to media/libstagefright/binding/mp4parse/src/tests.rs