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

Change-Id: Ib567b678baa71884b7d8b5b603cd4a9e3ced1c75