Add support for system images that contain the root directory
am: b3b8ce6241  -s ours

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