Revert "More build error fixes"

This reverts commit 71e99d852cedfe10b0b7536a1a5233870e3d0648.

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java