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

* commit '23466a95b6b66b9f9592148f4252775e16d46e5b':
  Camera2: Require 2 JPEG thumbnail resolutions.