Merge "add extra args to mkbootimg" into jb-mr1-dev