Revert "camera: Remove deprecated QCOM camera hacks"

This reverts commit ab7847c98ec68ad4c2db7b8155439f9fdaf639f0.
Revert "Revert "frameworks/av: Fixed framecount in AudioRecord""

This reverts commit f9bc6412ce9dd697ef29cbd48ed7e2297115ed70.
Revert "Revert "audio: Add support for non-pcm VOIP vocoders""

This reverts commit ead815e0cff61ee392475fbef36d1b8987989ad5.
audio: fixup the idef's for VOIP using ICS audio blobs
Revert "Revert "camera: Remove deprecated QCOM camera hacks""

This reverts commit 920ebdeb981c76738f9c136afb505ccc9304b5e9.
derp
Merge branch 'cm-10.2' of https://github.com/Team-Hydra/android_frameworks_av into cm-10.2