Cleanup

 Move Canvas to com.android.photos.canvas
 Remove workaround for b/8079561

Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
6 files changed