am f8177d38: Merge "Saving the system wallpaper thumbnail prefixed by the SDK_INT so that it is recreated after a system update." into ub-now-porkchop

* commit 'f8177d383a86bf0e5230f70c1635fa044ed4b0be':
  Saving the system wallpaper thumbnail prefixed by the SDK_INT so that it is recreated after a system update.