Fix Camera screen nail for external

Change-Id: I1a375c84734ca4a26f1ef204636a04aa7373f7bd

Conflicts:

	src/com/android/camera/PhotoModule.java
Fix External storage detection

Change-Id: I0ef995bb664d5f3f782216eb78f19e988ce056d6
Fix Camcorder screen nail for external

Change-Id: I05872a860ae5cfcb2baf480c2f866bd3df977086