fix errors from 4.2.2 merge

Conflicts:

	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java