Revert "Alternate default app picker (1/2)"

This reverts commit 6fccea057e0750fd5936ff03a651cf6710dd3a1a.

Conflicts:
	core/java/com/android/internal/app/ResolverActivity.java
Fix Halo master button
Split Frameworks (2/3)
Fix derp
Update WallPaper