Merge "WallpaperCropper has no tests, it doesn't need junit" am: a34472b7e6
am: 11436455cf

Change-Id: I5c15471c8e98a1a45df669c2d7a6a2956c9227b8