Merge remote branch 'goog/honeycomb-mr2'

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/core/ctscore.mk
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: Ic3a6a3754f1db91947217af64c43e8b7fb35695e