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