Remove duplicate

Conflicts:
	src/com/android/camera/PhotoModule.java

Change-Id: I2b308fa447c5312587c05bd5dca0ad1358047cd1