[automerger skipped] Merge "Add a header-version argument to fastboot" am: a10d40e2b2
am: 0f217b52b4  -s ours

Change-Id: I7788db487f3e799faf1aaf9e9bfe2ab394d4d1e4