Merge changes Icdf88bc3,I368e905a am: d3675725b8 am: d354d0a15b

Original change: https://android-review.googlesource.com/c/platform/development/+/1797049

Change-Id: Ibfaf1fdb7940bab487496e1f79692170902227b6

scripts/cargo2android.py

@@ -456,7 +456,7 @@ class Crate(object):
       self.root_pkg = self.crate_name
 
     # get the package version from running cargo metadata
-    if not self.runner.args.no_pkg_vers:
+    if not self.runner.args.no_pkg_vers and not self.skip_crate():
         self.get_pkg_version()
 
     self.device_supported = self.runner.args.device
@@ -483,8 +483,10 @@ class Crate(object):
     and where the package name does not match the emitted crate_name
     (e.g. [lib.name] is set).
     """
-    cargo_metadata = subprocess.run(['cargo', 'metadata', '--no-deps'],
-            cwd=os.path.abspath(self.cargo_dir), capture_output=True)
+    cargo_metadata = subprocess.run([self.runner.cargo_path, 'metadata', '--no-deps',
+                                     '--format-version', '1'],
+                                    cwd=os.path.abspath(self.cargo_dir),
+                                    stdout=subprocess.PIPE)
     if cargo_metadata.returncode:
         self.errors += ('ERROR: unable to get cargo metadata for package version; ' +
                 'return code ' + cargo_metadata.returncode + '\n')