Revert "Camera: HDR: don't reset focus manager when HDR is active."

This reverts commit b903ac758beac8fb7858f6d07e329de546165033.

Conflicts:
	src/com/android/camera/PhotoModule.java
Revert "Camera: HDR:  fix rotation issues."

This reverts commit 176b77e89eef9ef4034dc9dbe344f149886d856d.

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