Merge "Remove unneeded use of support library in WallpaperCropper."