Push sdcard-storage option. Fix crash (Set default Entry() and remove option, if not needed)

Conflicts:

	src/com/android/camera/StorageEnvironment.java