fix miss merge
fix mkbootimg arguments