Merge "Camera: Avoid Metadata re-allocation during shrinkCaptureResult" into pi-dev
am: 62e310cbfd

Change-Id: If86e613dafb3ac8268f543d64b424c0ffecd1521