Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev