Merge "fastboot: fix header_actual calculation"
am: 53135a4772

Change-Id: Ic14a7785f248ce15b3e01da0e6cd94b5f7a68921