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

* commit 'bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5':
  ProCamera: Fix memory leak in consumeFrameMetadata