am 22354d3c: Merge "Add support for system images that contain the root directory"

* commit '22354d3c496e2c21f873758d996878e68c2607bb':
  Add support for system images that contain the root directory