Merge "Avoid using JUnit code in production WallpaperCropper"