Merge changes I78bc86ad,Ieeab8376 am: 16ed4a3cc3

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

Change-Id: I5b7bee417d614ecf6994b0eafd84934ac919891d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

scripts/cargo2android.py

@@ -43,8 +43,6 @@ If there are rustc warning messages, this script will add
 a warning comment to the owner crate module in Android.bp.
 """
 
-from __future__ import print_function
-
 import argparse
 import glob
 import json
@@ -58,7 +56,7 @@ import sys
 
 # Some Rust packages include extra unwanted crates.
 # This set contains all such excluded crate names.
-EXCLUDED_CRATES = set(['protobuf_bin_gen_rust_do_not_use'])
+EXCLUDED_CRATES = {'protobuf_bin_gen_rust_do_not_use'}
 
 RENAME_MAP = {
     # This map includes all changes to the default rust module names
@@ -1547,7 +1545,7 @@ class Runner(object):
     return ''
 
   def add_empty_test(self, name):
-    if name == 'unittests':
+    if name.startswith('unittests'):
       self.empty_unittests = True
     else:
       self.empty_tests.add(name)