camera: Clean up code for restarting the preview

 * Fix another ZSL hang and remove redundant code.

Change-Id: I8075829bfc82bc94a8ae8d49234cecc4e3ca1faf