Revert "Merge in a lot of VANIR fixes and improvements"

This reverts commit 3fbdfa4cda565a66e535e3e16f14c7aa7771f88d.

Conflicts:
	core/java/android/widget/Editor.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	tools/aapt/Images.cpp

Change-Id: I10821415c43a30ec020f91ca0806f0c6247e425d