Merge "Make 'fastboot boot' command support boot header version 2"
am: b44996bfa9

Change-Id: I81239dd72347ebbe5360c2bcf9c158c84dd8cb79