am 2355f172: am 53787020: Merge "Camera2: Truncate JPEG images" into jb-mr1-dev

* commit '2355f172c80b32d205faad7a59f5410eb1198a80':
  Camera2: Truncate JPEG images