Merge "Avoid using JUnit code in production WallpaperCropper" am: 9598c98db0
am: e4add524e9

Change-Id: I8c22e84feff3fa597403a7de6300528f823268d7