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

Change-Id: I1c39ff5a092223f22c5ca2a18c083cbf89480a9a