Merge "Modify mkbootimg.py to support boot image header version 2"
am: ed3f1a584a

Change-Id: I0e68ac2fa5c0fe25e5e479e411586cfd2c2f6a35