Changes to mkbootimg
Changes to rootdir
Merge upstream changes