Restore previous ViewConfiguration constants

Change-Id: I8cb2b552aa11ad1505a8a97f593307420d919371

Conflicts:
	core/java/android/view/ViewConfiguration.java