am c0db1fb8: am f52651ef: Merge "Add default WallpaperCropper to the build" into klp-dev

* commit 'c0db1fb812ba4b110dd187152701acc4b6aa3d58':
  Add default WallpaperCropper to the build