am 5b80f5db: Support [-j <journal_size>] in mkuserimg.sh automerge: 8f85f69 automerge: 4ea0822

* commit '5b80f5dbfd8a3f1fbe180094153fbfdb4b1e242d':
  Support [-j <journal_size>] in mkuserimg.sh