Revert "Squash: Memory leaks, NPEs, races and optimizations for fw/base"

This reverts commit 6703f4bd771f5b6eda886bb3560350f9448264ea.

Conflicts:

	core/java/android/service/wallpaper/WallpaperService.java