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

* commit 'f48a4ac994a4b613007087d0f6d9e099e630a918':
  Camera: Correct the Heap ID used for preview buffer allocation