Merge "Correct comment in boot image header"
am: fe86a1473f

Change-Id: I42f37a665948d60efe1af745be5ae64c7e0af7b7