Revert "fix the build"

This reverts commit 14f8c8a539b341e550fafa7f18cdd0c192591707.
i'm going to seperate these

This reverts commit 18e341d162cacebe8b91f610d831e0d0f9b04db3.
update to candy wallpaper

Change-Id: I8f5584bb4afc1aed4aed194106d427b7ff6b48c8
HALO 2/2

Change-Id: Iaaa538e4d63feeb1da5ca7bc48fb2916e4bd591b