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

* commit '42caec28ab1393853c342a989ec844846235013f':
  add extra args to mkbootimg