Merge "Camera: Correct the Heap ID used for preview buffer allocation" into jb-mr2-dev