Snap for 5975424 from 77cb85583fe28328f2a1f6e7e5b04808a712450c to rvc-release

Change-Id: I24cc84e6fd200130afb7c7b9d26e15c4e10ed32b
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
new file mode 100644
index 0000000..149af46
--- /dev/null
+++ b/.cargo_vcs_info.json
@@ -0,0 +1,5 @@
+{
+  "git": {
+    "sha1": "7e714dc8dd0e17b9e6383f164d5095e60370c482"
+  }
+}
diff --git a/Android.bp b/Android.bp
index 06fe6eb..5500c76 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,12 +1,13 @@
+// This file is generated by cargo2android.py.
+
 rust_proc_macro {
     name: "libremain",
-    deny_warnings: false,
     crate_name: "remain",
-    srcs: ["src/lib.rs",],
+    srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
+        "libproc_macro2",
         "libquote",
         "libsyn",
-        "libproc_macro2",
     ],
 }
diff --git a/Cargo.toml b/Cargo.toml
index c635f7a..4134e67 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,39 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
 [package]
-name = "remain"
-version = "0.1.3" # remember to update number in readme for major versions
-authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
-license = "MIT OR Apache-2.0"
+name = "remain"
+version = "0.1.3"
+authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Compile-time checks that an enum, struct, or match is written in sorted order."
-repository = "https://github.com/dtolnay/remain"
 documentation = "https://docs.rs/remain"
 readme = "README.md"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/dtolnay/remain"
 
 [lib]
 proc-macro = true
+[dependencies.proc-macro2]
+version = "0.4"
 
-[dependencies]
-proc-macro2 = "0.4"
-quote = "0.6"
-syn = { version = "0.15", features = ["full", "visit-mut"] }
+[dependencies.quote]
+version = "0.6"
 
-[dev-dependencies]
-select-rustc = "0.1"
-trybuild = "1.0"
+[dependencies.syn]
+version = "0.15"
+features = ["full", "visit-mut"]
+[dev-dependencies.select-rustc]
+version = "0.1"
+
+[dev-dependencies.trybuild]
+version = "1.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
new file mode 100644
index 0000000..c635f7a
--- /dev/null
+++ b/Cargo.toml.orig
@@ -0,0 +1,22 @@
+[package]
+name = "remain"
+version = "0.1.3" # remember to update number in readme for major versions
+authors = ["David Tolnay <dtolnay@gmail.com>"]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+description = "Compile-time checks that an enum, struct, or match is written in sorted order."
+repository = "https://github.com/dtolnay/remain"
+documentation = "https://docs.rs/remain"
+readme = "README.md"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "0.4"
+quote = "0.6"
+syn = { version = "0.15", features = ["full", "visit-mut"] }
+
+[dev-dependencies]
+select-rustc = "0.1"
+trybuild = "1.0"