unify storage

Conflicts:
	rootdir/etc/fstab.qcom