am 5683ded7: am bdeaccfd: Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev

* commit '5683ded788b5cf6aa39fe9ced8370057fe533094':
  ProCamera: Fix memory leak in consumeFrameMetadata