Merge "boot_signer should support boot header version 2"
am: 92cf0ef128

Change-Id: I7944c69bd99c637b6623185e4fd112b8d03e9c25