am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."

* commit 'b952587184572070805243e6f8380ceb769f441c':
  Switch to a type-safe album art interface.