Merge remote branch 'korg/froyo' into froyomerge

Conflicts:
	tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
	tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
	tests/tests/view/src/android/view/cts/ViewTest.java
	tools/host/src/com/android/cts/Version.java
	tools/utils/CollectAllTests.java

Change-Id: I32c04ce6a2eba4c1f30fe80afb9bf2adcf269e73