Merge "build: pass version and patch level to mkbootimg" am: b32d845090

am: 450f15111c

* commit '450f15111ccd9fa54382e159a145954273f45b15':
  build: pass version and patch level to mkbootimg

tools/releasetools/common.py

@@ -414,6 +414,10 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None,
   if args and args.strip():
     cmd.extend(shlex.split(args))
 
+  args = info_dict.get("mkbootimg_version_args", None)
+  if args and args.strip():
+    cmd.extend(shlex.split(args))
+
   if has_ramdisk:
     cmd.extend(["--ramdisk", ramdisk_img.name])