Merge "Camera: allow FULLHD_ALT in jpeg sizes" into marshmallow-cts-dev am: 1f8716504d
am: 066ff634e0

* commit '066ff634e07cd87d5c2bbb18a7d10e5eff10ec97':
  Camera: allow FULLHD_ALT in jpeg sizes