Fixes corner case test_distro_after_rebuild

* Added extra logic to handle the case where the images differ, but
  both return the empty string as their name

Change-Id: I9629a219b2d4258204849286a619e7416ae2882f
Merge "Fixes corner case test_distro_after_rebuild"