Get rid of the stamping stuff

Conflicts:
	core/jni/Android.mk