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

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