Merge "Revert "Add target specific option to skip wallpapers from build"" into gingerbread