Merge remote branch 'goog/gingerbread' into manualmerge

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
	tests/expectations/knownfailures.txt
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: I9521c6c60c60a1a36d7a882637290303bcee4997