Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1

Conflicts:
	core/java/android/app/ActivityThread.java
	core/java/android/content/pm/ApplicationInfo.java
	core/java/android/content/pm/PackageParser.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/SystemServer.java
	test-runner/src/android/test/mock/MockPackageManager.java