Merge "Add a header-version argument to fastboot"
am: a10d40e2b2

Change-Id: I1fc1ed567bd269c9ab32d810ba63489457416ab2