am 4d755a1b: am 0375fd13: Merge "add -f option to mkbootfs to load file perms from file" into jb-dev

* commit '4d755a1b37f44ec935b06bbc921d128272e9ee96':
  add -f option to mkbootfs to load file perms from file