Merge "Fix cargo2android's license block preservation" am: dddc6e0873 am: 47aad36a67

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

Change-Id: Ida1a28ad198193c44c1c74de6f7d53f9c79b6193

scripts/cargo2android.py

@@ -1131,8 +1131,8 @@ class Runner(object):
       # Firstly skip ANDROID_BP_HEADER
       while line.startswith('//'):
         line = intf.readline()
-      # Read all lines until we see a rust_* rule.
-      while line != '' and not line.startswith('rust_'):
+      # Read all lines until we see a rust_* or genrule rule.
+      while line != '' and not (line.startswith('rust_') or line.startswith('genrule {')):
         license += line
         line = intf.readline()
     return license.strip()