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

Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5