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

Change-Id: Ibbfa3431ca5cad5855a67826b5c8d632dad26967