camera: bring back more of the preview metadata workaround.

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

Change-Id: Ie2cef65263816b22e45513cfc639c32b48a49bec
AudioPolicyService: Support MR1 audio_policy

Change-Id: I26abd352f327256856021b311efb1e23b46b6023
Merge remote-tracking branch 'ls/jb3'; commit 'HEAD' into HEAD