Merge "Camera2: Truncate JPEG images" into jb-mr1-dev