Merge "Revert "Move canvas WallpaperEngine to droidFood"" into tm-qpr-dev