camera: Re-add workaround for freeze when recording stops

 * Device-specific issue. Readd until driver is fixed.

Change-Id: Ic57a6ebeb40370c0e4cb25eef37dfc0eec8717a2
Revert "camera: Enable face detection parameter if required"

This reverts commit 321e62c4b58f35b2ba56ab7fceb4c57cb31dce5f.

Change-Id: Ib78f851f11490592324b3af003120bc66f754b55
Merge branch 'cm' into HEAD