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

Change-Id: I1a2c5018f2f85bb21fccdccd3c736fdc844dcf92