Small 4.4 fixes

Conflicts:
	sdcard/Android.mk