am cccd07ba: am 8f7e3e0f: Merge "AlbumArt image of songs in the non-primary storage root dir are images in the same dir"

* commit 'cccd07babf0b6cc2ac6979edbf780e32a02addd6':
  AlbumArt image of songs in the non-primary storage root dir are images in the same dir