Revert "Camera: Mem-leak"

This reverts commit 46b761ab50e36daa2ff79527553014905e784895.

We see some regressions with this change
so we are reverting it for now. We will
fix the issues soon.

Change-Id: I59da92087006cef0da16c8a11fe7c31f32aa0312
7 files changed