Merge "Add support for system images that contain the root directory"