camera: bring back more of the preview metadata workaround.

Fixes issues with switching between FFC and back camera on some devices.

Change-Id: Ie2cef65263816b22e45513cfc639c32b48a49bec
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_av into jb43