am 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev

* commit '1e845d33af68673f0a6712c9c22dc2c37eebbc9d':
  add extra args to mkbootimg