Selectively restore non-stupid parts of stuff we had
before a patented nuclear decrapificating

Change-Id: I679f5748365bb50451abc71398dcf35002282330

Conflicts:
	core/java/android/webkit/CallbackProxy.java
	core/java/android/widget/ProgressBar.java
	core/java/android/widget/Toast.java

Conflicts:
	core/java/android/webkit/BrowserFrame.java
	core/java/android/webkit/CallbackProxy.java
	core/java/android/widget/Toast.java

Conflicts:
	core/java/android/widget/ProgressBar.java