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

Change-Id: I50531ccf38682d044f7e57e3bddd8784cc2fd2ad