Fix Build

Conflicts:
	core/java/android/app/ResourcesManager.java