Revert "Trebuchet: add lockscreen wallpaper picker"

This reverts commit 29c2da02bf48fbdba977bc774027e218487e1abe.

Conflicts:
	AndroidManifest.xml