Merge "Camera2: Add JPEG transport header" into jb-mr1-dev