Some hidden surprises for the Slim folk!

Conflicts:
	core/java/com/android/internal/app/PlatLogoActivity.java

Change-Id: I23b76f8e8e475050d76ce6752d0858537c5983a1