fixes

This reverts commit f1c0642e5a52bdbbc823e3a220a414f14a499230.

Conflicts:
	rootdir/etc/init.qcom.rc

Conflicts:
	rootdir/Android.mk