Rebase external storage capability

Add external storage capability

Change-Id: I600d82528de2ef8192967d3802cdab3012840c30

Conflicts:

	res/xml/video_preferences.xml
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/Storage.java
	src/com/android/camera/VideoModule.java