Update for KOT49H

Change-Id: I9c6b4a5930eca323fade59b30ad77ded5b125c4a
camera: Fixes for race conditions in abnormal snapshot stop.

Change-Id: Iba20800baee92dcd59ae6edb96e7dc1953c83a88
Bug: 12467743
Bug: 11021907