Revert " more fixes for aosp"

This reverts commit 8721983a89c59a3be45c3ec5438c2ad4b751ed9c.

Conflicts:

	device.mk
	profiles/ramdisk/init.mapphone_umts.rc