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

Change-Id: If3f29c4bf71a2752f07963788a4c73a0c065549a