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

* commit '1f8716504d46aa21ffd2dff741e8dc3895728d6d':
  Camera: allow FULLHD_ALT in jpeg sizes