Snap for 6396176 from 82a5e8ba5b3d8e05f03350787890528b1a32f6ac to rvc-d1-release

Change-Id: Icb45e2dbefe0f511bee4a40279975cefc3ee9f4d
diff --git a/mkbootimg.py b/mkbootimg.py
index 9682033..00a4623 100644
--- a/mkbootimg.py
+++ b/mkbootimg.py
@@ -64,7 +64,7 @@
 
 
 def write_header_v3(args):
-    BOOT_IMAGE_HEADER_V3_SIZE = 1596
+    BOOT_IMAGE_HEADER_V3_SIZE = 1580
     BOOT_MAGIC = 'ANDROID!'.encode()
 
     args.output.write(pack('8s', BOOT_MAGIC))