Remove unuseful things and add stamping

Conflicts:
	services/java/com/android/server/SystemServer.java