am 38f910bd: am 23466a95: Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev

* commit '38f910bdfa1fb0665261eb60e0afdb4986c8934f':
  Camera2: Require 2 JPEG thumbnail resolutions.